diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt index 28a710d58a..71da2d576c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt @@ -73,24 +73,21 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyInvokeDocs] * @return The [DataColumn] this [KProperty Accessor][KProperty] points to. */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty.invoke(): DataColumn = this@ColumnSelectionDsl[this] /** * @include [CommonKPropertyInvokeDocs] * @return The [ColumnGroup] this [KProperty Accessor][KProperty] points to. */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty>.invoke(): ColumnGroup = this@ColumnSelectionDsl[this] /** * @include [CommonKPropertyInvokeDocs] * @return The [FrameColumn] this [KProperty Accessor][KProperty] points to. */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty>.invoke(): FrameColumn = this@ColumnSelectionDsl[this] /** @@ -114,8 +111,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty>.get(column: KProperty): DataColumn = invoke()[column] /** @@ -124,8 +120,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty>.get(column: KProperty>): ColumnGroup = invoke()[column] @@ -135,8 +130,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty>.get(column: KProperty>): FrameColumn = invoke()[column] @@ -144,16 +138,14 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyGetDocs] * @return The [DataColumn] these [KProperty Accessors][KProperty] point to. */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty.get(column: KProperty): DataColumn = invoke().asColumnGroup()[column] /** * @include [CommonKPropertyGetDocs] * @return The [ColumnGroup] these [KProperty Accessors][KProperty] point to. */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty.get(column: KProperty>): ColumnGroup = invoke().asColumnGroup()[column] @@ -161,8 +153,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyGetDocs] * @return The [FrameColumn] these [KProperty Accessors][KProperty] point to. */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty.get(column: KProperty>): FrameColumn = invoke().asColumnGroup()[column] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt index dc409fcf66..f711b1da75 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt @@ -406,8 +406,7 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup `[`{`][KProperty.select]` colA `[`and`][ColumnsSelectionDsl.and]` colB `[`}`][KProperty.select]` }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty.invoke(selector: ColumnsSelector): ColumnSet = columnGroup(this).select(selector) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt index 77bd83cf1e..c9226538d0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt @@ -89,18 +89,15 @@ public fun DataFrame.properties(): ColumnsScope = this public fun ColumnsContainer.getColumn(name: String): AnyCol = getColumnOrNull(name) ?: throw IllegalArgumentException("Column not found: '$name'") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.getColumn(column: ColumnReference>): FrameColumn = getColumnOrNull(column)?.asFrameColumn() ?: throw IllegalArgumentException("FrameColumn not found: '$column'") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.getColumn(column: ColumnReference>): ColumnGroup = getColumnOrNull(column)?.asColumnGroup() ?: throw IllegalArgumentException("ColumnGroup not found: '$column'") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.getColumn(column: ColumnReference): DataColumn = getColumnOrNull(column) ?: throw IllegalArgumentException("Column not found: '$column'") @@ -121,13 +118,11 @@ public fun ColumnsContainer.getColumnGroup(index: Int): ColumnGroup<*> = public fun ColumnsContainer.getColumnGroup(name: String): ColumnGroup<*> = getColumn(name).asColumnGroup() -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.getColumnGroup(column: KProperty<*>): ColumnGroup<*> = getColumnGroup(column.columnName) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.getColumnGroup(column: ColumnReference>): ColumnGroup = getColumn(column) @@ -141,8 +136,7 @@ public fun ColumnsContainer.getColumnGroup(column: ColumnSelector ColumnsContainer.getColumnGroupOrNull(name: String): ColumnGroup<*>? = getColumnOrNull(name)?.asColumnGroup() -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.getColumnGroupOrNull(column: KProperty<*>): ColumnGroup<*>? = getColumnGroupOrNull(column.columnName) @@ -150,20 +144,16 @@ public fun ColumnsContainer.getColumnGroupOrNull(column: KProperty<*>): C // region containsColumn -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer<*>.containsColumn(column: ColumnReference): Boolean = getColumnOrNull(column) != null -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer<*>.containsColumn(column: KProperty<*>): Boolean = containsColumn(column.columnName) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun ColumnsContainer<*>.contains(column: AnyColumnReference): Boolean = containsColumn(column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun ColumnsContainer<*>.contains(column: KProperty<*>): Boolean = containsColumn(column) // region rows diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt index 67f8d62982..0e9c26e91b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt @@ -73,18 +73,15 @@ public fun AnyRow.namedValues(): List> = public fun AnyRow.getValue(columnName: String): T = get(columnName) as T -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyRow.getValue(column: ColumnReference): T = get(column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyRow.getValue(column: KProperty): T = get(column) public fun AnyRow.getValueOrNull(columnName: String): T? = getOrNull(columnName) as T? -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyRow.getValueOrNull(column: KProperty): T? = getValueOrNull(column.columnName) // endregion @@ -93,18 +90,15 @@ public fun AnyRow.getValueOrNull(column: KProperty): T? = getValueOrNull< public fun AnyRow.containsKey(columnName: String): Boolean = owner.containsColumn(columnName) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyRow.containsKey(column: AnyColumnReference): Boolean = owner.containsColumn(column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyRow.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column) public operator fun AnyRow.contains(column: AnyColumnReference): Boolean = containsKey(column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey(column) // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt index b735c44d10..99cfb63009 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt @@ -86,8 +86,7 @@ public fun DataFrame.fillNulls(vararg columns: String): Update = * @include [SelectingColumns.KProperties.WithExample] {@include [SetFillNullsOperationArg]} * @include [Update.KPropertiesParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.fillNulls(vararg columns: KProperty): Update = fillNulls { columns.toColumnSet() } @@ -96,8 +95,7 @@ public fun DataFrame.fillNulls(vararg columns: KProperty): Update DataFrame.fillNulls(vararg columns: ColumnReference): Update = fillNulls { columns.toColumnSet() } @@ -216,8 +214,7 @@ public fun DataFrame.fillNaNs(vararg columns: String): Update = * @include [SelectingColumns.KProperties.WithExample] {@include [SetFillNaNsOperationArg]} * @include [Update.KPropertiesParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.fillNaNs(vararg columns: KProperty): Update = fillNaNs { columns.toColumnSet() } /** @@ -225,8 +222,7 @@ public fun DataFrame.fillNaNs(vararg columns: KProperty): Update DataFrame.fillNaNs(vararg columns: ColumnReference): Update = fillNaNs { columns.toColumnSet() } @@ -291,8 +287,7 @@ public fun DataFrame.fillNA(vararg columns: String): Update = fi * @include [SelectingColumns.KProperties.WithExample] {@include [SetFillNAOperationArg]} * @include [Update.KPropertiesParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.fillNA(vararg columns: KProperty): Update = fillNA { columns.toColumnSet() } /** @@ -300,8 +295,7 @@ public fun DataFrame.fillNA(vararg columns: KProperty): Update DataFrame.fillNA(vararg columns: ColumnReference): Update = fillNA { columns.toColumnSet() } @@ -372,8 +366,7 @@ private interface CommonDropNullsFunctionDoc * @include [DropNulls.WhereAllNullParam] * @include [DropDslParam] */ -@Refine -@Interpretable("DropNulls0") +@[Refine Interpretable("DropNulls0")] public fun DataFrame.dropNulls(whereAllNull: Boolean = false, columns: ColumnsSelector): DataFrame { val cols = this[columns] return if (whereAllNull) { @@ -383,8 +376,7 @@ public fun DataFrame.dropNulls(whereAllNull: Boolean = false, columns: Co } } -@Refine -@Interpretable("DropNulls0") +@[Refine Interpretable("DropNulls0")] @Deprecated( "DataFrame conventional name for filterNot* functions is drop*", ReplaceWith("dropNulls(columns = columns)"), @@ -397,8 +389,7 @@ public fun DataFrame.filterNotNull(columns: ColumnsSelector): DataF * This overload operates on all columns in the [DataFrame]. * @include [DropNulls.WhereAllNullParam] */ -@Refine -@Interpretable("DropNulls1") +@[Refine Interpretable("DropNulls1")] public fun DataFrame.dropNulls(whereAllNull: Boolean = false): DataFrame = dropNulls(whereAllNull) { all() } /** @@ -408,8 +399,7 @@ public fun DataFrame.dropNulls(whereAllNull: Boolean = false): DataFrame< * @include [DropNulls.WhereAllNullParam] * @include [DropKPropertiesParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.dropNulls(vararg columns: KProperty<*>, whereAllNull: Boolean = false): DataFrame = dropNulls(whereAllNull) { columns.toColumnSet() } @@ -430,8 +420,7 @@ public fun DataFrame.dropNulls(vararg columns: String, whereAllNull: Bool * @include [DropNulls.WhereAllNullParam] * @include [DropColumnAccessorsParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.dropNulls(vararg columns: AnyColumnReference, whereAllNull: Boolean = false): DataFrame = dropNulls(whereAllNull) { columns.toColumnSet() } @@ -493,8 +482,7 @@ private interface CommonDropNAFunctionDoc * @include [DropNA.WhereAllNAParam] * @include [DropDslParam] */ -@Refine -@Interpretable("DropNa0") +@[Refine Interpretable("DropNa0")] public fun DataFrame.dropNA(whereAllNA: Boolean = false, columns: ColumnsSelector): DataFrame { val cols = this[columns] return if (whereAllNA) { @@ -511,8 +499,7 @@ public fun DataFrame.dropNA(whereAllNA: Boolean = false, columns: Columns * @include [DropNA.WhereAllNAParam] * @include [DropKPropertiesParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.dropNA(vararg columns: KProperty<*>, whereAllNA: Boolean = false): DataFrame = dropNA(whereAllNA) { columns.toColumnSet() } @@ -533,8 +520,7 @@ public fun DataFrame.dropNA(vararg columns: String, whereAllNA: Boolean = * @include [DropNA.WhereAllNAParam] * @include [DropColumnAccessorsParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.dropNA(vararg columns: AnyColumnReference, whereAllNA: Boolean = false): DataFrame = dropNA(whereAllNA) { columns.toColumnSet() } @@ -543,8 +529,7 @@ public fun DataFrame.dropNA(vararg columns: AnyColumnReference, whereAllN * This overload operates on all columns in the [DataFrame]. * @include [DropNA.WhereAllNAParam] */ -@Refine -@Interpretable("DropNa1") +@[Refine Interpretable("DropNa1")] public fun DataFrame.dropNA(whereAllNA: Boolean = false): DataFrame = dropNA(whereAllNA) { all() } /** @@ -624,8 +609,7 @@ public fun DataFrame.dropNaNs(whereAllNaN: Boolean = false, columns: Colu * @include [DropNaNs.WhereAllNaNParam] * @include [DropKPropertiesParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.dropNaNs(vararg columns: KProperty<*>, whereAllNaN: Boolean = false): DataFrame = dropNaNs(whereAllNaN) { columns.toColumnSet() } @@ -646,8 +630,7 @@ public fun DataFrame.dropNaNs(vararg columns: String, whereAllNaN: Boolea * @include [DropNaNs.WhereAllNaNParam] * @include [DropColumnAccessorsParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.dropNaNs(vararg columns: AnyColumnReference, whereAllNaN: Boolean = false): DataFrame = dropNaNs(whereAllNaN) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt index 4aed230f44..cb0c3c254d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt @@ -116,8 +116,7 @@ public fun DataFrame.add(vararg dataFrames: AnyFrame): DataFrame = add * @throws [UnequalColumnSizesException] if columns in an expected result have different sizes. * @return new [DataFrame] with added columns. */ -@Refine -@Interpretable("DataFrameAddAll") +@[Refine Interpretable("DataFrameAddAll")] public fun DataFrame.addAll(vararg dataFrames: AnyFrame): DataFrame = addAll(dataFrames.asIterable()) /** @@ -216,24 +215,21 @@ internal interface AddExpressionDocs * * @throws DuplicateColumnNamesException if [DataFrame] already contains a column with given [name] */ -@Refine -@Interpretable("Add") +@[Refine Interpretable("Add")] public inline fun DataFrame.add( name: String, infer: Infer = Infer.Nulls, noinline expression: AddExpression, ): DataFrame = (this + mapToColumn(name, infer, expression)) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.add( property: KProperty, infer: Infer = Infer.Nulls, noinline expression: AddExpression, ): DataFrame = (this + mapToColumn(property, infer, expression)) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.add( column: ColumnAccessor, infer: Infer = Infer.Nulls, @@ -319,46 +315,38 @@ public class AddDsl( add(this, Infer.Nulls, expression) // TODO: use path instead of name - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline infix fun ColumnAccessor.from(noinline expression: AddExpression): Boolean = name().from(expression) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline infix fun KProperty.from(noinline expression: AddExpression): Boolean = add(name, Infer.Nulls, expression) public infix fun String.from(column: AnyColumnReference): Boolean = add(column.rename(this)) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline infix fun ColumnAccessor.from(column: ColumnReference): Boolean = name() from column - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline infix fun KProperty.from(column: ColumnReference): Boolean = name from column @Interpretable("Into") public infix fun AnyColumnReference.into(name: String): Boolean = add(rename(name)) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnReference.into(column: ColumnAccessor): Boolean = into(column.name()) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnReference.into(column: KProperty): Boolean = into(column.name) @Interpretable("AddDslStringInvoke") public operator fun String.invoke(body: AddDsl.() -> Unit): Unit = group(this, body) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun AnyColumnGroupAccessor.from(body: AddDsl.() -> Unit): Unit = group(this, body) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun group(column: AnyColumnGroupAccessor, body: AddDsl.() -> Unit): Unit = group(column.name(), body) @Interpretable("AddDslNamedGroup") @@ -374,8 +362,7 @@ public class AddDsl( @Interpretable("AddDslAddGroupInto") public infix fun AddGroup.into(groupName: String): Unit = group(groupName, body) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun AddGroup.into(column: AnyColumnGroupAccessor): Unit = into(column.name()) } @@ -416,8 +403,7 @@ public class AddDsl( * @param body An [AddDsl] expression used to define new columns and column groups. * @return A new [DataFrame] with the added columns. */ -@Refine -@Interpretable("AddWithDsl") +@[Refine Interpretable("AddWithDsl")] public fun DataFrame.add(body: AddDsl.() -> Unit): DataFrame { val dsl = AddDsl(this) body(dsl) @@ -461,16 +447,14 @@ public fun DataFrame.add(body: AddDsl.() -> Unit): DataFrame { * * @throws DuplicateColumnNamesException if group [DataFrame]s already contains a column with given [name]. */ -@Refine -@Interpretable("GroupByAdd") +@[Refine Interpretable("GroupByAdd")] public inline fun GroupBy.add( name: String, infer: Infer = Infer.Nulls, noinline expression: AddExpression, ): GroupBy = updateGroups { add(name, infer, expression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun GroupBy.add( column: ColumnAccessor, infer: Infer = Infer.Nulls, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt index 4a177e8e81..547ff368c2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt @@ -17,12 +17,10 @@ public fun AnyCol.addId(columnName: String = "id"): AnyFrame = toDataFrame().add // region DataFrame -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.addId(column: ColumnAccessor): DataFrame = insert(column) { index() }.at(0) -@Refine -@Interpretable("AddId") +@[Refine Interpretable("AddId")] public fun DataFrame.addId(columnName: String = "id"): DataFrame = insert(columnName) { index() }.at(0) // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/aggregate.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/aggregate.kt index 0c592a4316..91c7e99457 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/aggregate.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/aggregate.kt @@ -18,7 +18,6 @@ public fun Pivot.aggregate(separate: Boolean = false, body: Selector Grouped.aggregate(body: AggregateGroupedBody): DataFrame = aggregateGroupBy((this as GroupBy<*, *>).toDataFrame(), { groups.cast() }, removeColumns = true, body).cast() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt index 098523548a..a4f4fafef3 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt @@ -304,8 +304,7 @@ public interface AllColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::columnGroup.`[allCols][KProperty.allCols]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allCols(): ColumnSet<*> = columnGroup(this).allCols() /** @@ -487,30 +486,25 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] \ \{ myColumn \}} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.allColsAfter(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsAfter(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] ("myColumn")} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsAfter(column: String): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] (myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsAfter(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] (Type::myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsAfter(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @@ -713,30 +707,25 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] \ \{ myColumn \}} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.allColsFrom(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsFrom(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] ("myColumn")} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsFrom(column: String): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] (myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsFrom(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] (Type::myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsFrom(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @@ -938,30 +927,25 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] \ \{ myColumn \}} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.allColsBefore(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsBefore(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] ("myColumn")} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsBefore(column: String): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] (myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsBefore(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] (Type::myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsBefore(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @@ -1164,30 +1148,25 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] \ \{ myColumn \}} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.allColsUpTo(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsUpTo(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] ("myColumn")} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsUpTo(column: String): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] (myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsUpTo(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] (Type::myColumn)} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsUpTo(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt index b4c1c9ac90..948be67e5e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt @@ -288,8 +288,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnSetInfixDocs.ARGUMENT_1] Person::age * @set [ColumnSetInfixDocs.ARGUMENT_2] Person::name */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnSet.except(other: KProperty): ColumnSet = except(column(other)) /** @@ -299,8 +298,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnSetVarargDocs.ARGUMENT_1] (Person::age, Person::height) * @set [ColumnSetVarargDocs.ARGUMENT_2] (Person::name) */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnSet.except(vararg others: KProperty): ColumnSet = except(others.toColumnSet()) /** @@ -380,8 +378,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnsSelectionDslDocs.ARGUMENT_1] `(Person::age, Person::height)` * @set [ColumnsSelectionDslDocs.ARGUMENT_2] `(Person::name)` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsSelectionDsl<*>.allExcept(vararg others: KProperty<*>): ColumnSet<*> = asSingleColumn().allColsExceptInternal(others.toColumnSet()) @@ -528,8 +525,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.SingleColumnReceiverArgs] * @include [ColumnGroupDocs.KPropertyArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = allColsExceptInternal(others.toColumnSet()) @@ -584,8 +580,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.SingleColumnReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.except(vararg others: KProperty<*>): SingleColumn> = exceptInternal(others.toColumnSet()) @@ -634,8 +629,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.StringReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -652,8 +646,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.SelectorArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.except(selector: ColumnsSelector): SingleColumn> = columnGroup(this).exceptInternal(selector.toColumns()) @@ -680,8 +673,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.StringArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -692,8 +684,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty>.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -702,8 +693,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -714,8 +704,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty>.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -724,8 +713,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.ColumnPathArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -736,8 +724,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty>.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -778,8 +765,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.ColumnPathReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -833,8 +819,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.StringReceiverArgs] * @include [ColumnGroupDocs.KPropertyArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -855,8 +840,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.SelectorArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.allColsExcept(selector: ColumnsSelector): ColumnSet<*> = columnGroup(this).allColsExcept(selector) @@ -883,8 +867,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.StringArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsExcept(vararg others: String): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -893,8 +876,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.KPropertyArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -903,8 +885,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.ColumnPathArgs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt index 097ad09c53..61570a777c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt @@ -124,8 +124,7 @@ public interface AndColumnsSelectionDsl { public infix fun ColumnsResolver.and(other: String): ColumnSet<*> = this and other.toColumnAccessor() /** @include [ColumnsResolverAndDocs] {@set [ColumnsResolverAndDocs.Argument] `Type::colB`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnsResolver.and(other: KProperty): ColumnSet = this and other.toColumnAccessor() // endregion @@ -153,8 +152,7 @@ public interface AndColumnsSelectionDsl { public infix fun String.and(other: String): ColumnSet<*> = toColumnAccessor() and other.toColumnAccessor() /** @include [StringAndDocs] {@set [StringAndDocs.Argument] `Type::colB`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun String.and(other: KProperty): ColumnSet<*> = toColumnAccessor() and other // endregion @@ -173,24 +171,20 @@ public interface AndColumnsSelectionDsl { } /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] [`colsOf`][SingleColumn.colsOf]`<`[`Int`][Int]`>()`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.and(other: ColumnsResolver): ColumnSet = toColumnAccessor() and other /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] `{ colA `[/][DataColumn.div]` 2.0 `[`named`][ColumnReference.named]` "half colA" \}`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.and(other: () -> ColumnsResolver): ColumnSet = toColumnAccessor() and other() /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] `"colB"`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.and(other: String): ColumnSet<*> = toColumnAccessor() and other /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] `Type::colB`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.and(other: KProperty): ColumnSet = toColumnAccessor() and other.toColumnAccessor() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt index f4addacf8a..5b0bfa781e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt @@ -168,8 +168,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.col(col: ColumnAccessor): SingleColumn = this.ensureIsColumnGroup().transformSingle { val child = it.getCol(col) @@ -180,32 +179,28 @@ public interface ColColumnsSelectionDsl { /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.col(col: ColumnAccessor): ColumnAccessor = this.ensureIsColumnGroup().column(col.path()) /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) @@ -292,16 +287,14 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(name: String): ColumnAccessor<*> = col(name) /** * @include [ColNameDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColDocs.ColumnTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(name: String): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(name) @@ -397,16 +390,14 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(path: ColumnPath): ColumnAccessor<*> = col(path) /** * @include [ColPathDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColDocs.ColumnTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(path: ColumnPath): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(path) @@ -440,46 +431,40 @@ public interface ColColumnsSelectionDsl { /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER]} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun col(property: KProperty): SingleColumn = column(property) /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.col(property: KProperty): SingleColumn = col(property.name) /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.col(property: KProperty): ColumnAccessor = this.ensureIsColumnGroup().column(property) /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) @@ -567,16 +552,14 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(index: Int): SingleColumn<*> = col(index) /** * @include [ColIndexDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColDocs.ColumnTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.col(index: Int): SingleColumn = columnGroup(this).col(index) /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt index 3474fc6126..ea4bb71e43 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt @@ -161,16 +161,14 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER]} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = colGroup.ensureIsColumnGroup() /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.colGroup(colGroup: ColumnAccessor>): SingleColumn> = this.ensureIsColumnGroup().transformSingle { val child = it.getCol(colGroup) @@ -184,32 +182,28 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -290,16 +284,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(name: String): ColumnAccessor> = colGroup(name) /** * @include [ColGroupNameDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(name: String): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(name).ensureIsColumnGroup() @@ -395,16 +387,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(path: ColumnPath): ColumnAccessor> = colGroup(path) /** * @include [ColGroupPathDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(path: ColumnPath): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(path).ensureIsColumnGroup() @@ -440,16 +430,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun colGroup(property: KProperty>): SingleColumn> = columnGroup(property).ensureIsColumnGroup() /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER]} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun colGroup(property: KProperty): SingleColumn> = columnGroup(property).ensureIsColumnGroup() @@ -458,16 +446,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.colGroup(property: KProperty>): SingleColumn> = colGroup(property.name) /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.colGroup(property: KProperty): SingleColumn> = colGroup(property.name) @@ -476,16 +462,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.colGroup(property: KProperty>): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.colGroup(property: KProperty): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -494,16 +478,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -512,16 +494,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -530,16 +510,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -624,16 +602,14 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(index: Int): SingleColumn> = colGroup(index) /** * @include [ColGroupIndexDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colGroup(index: Int): SingleColumn> = columnGroup(this).colGroup(index) /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt index acb9c84503..147f9555c2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt @@ -356,14 +356,12 @@ public interface ColsColumnsSelectionDsl { private interface KPropertyColsPredicateDocs /** @include [KPropertyColsPredicateDocs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).cols(predicate) /** @include [KPropertyColsPredicateDocs] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty<*>.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = cols(predicate) /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt index 0226d3507e..c4ff23d1c1 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt @@ -220,8 +220,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { Type::myColumnGroup.`[colsAtAnyDepth][KProperty.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsAtAnyDepth(predicate) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt index 65b3a52e55..3c23adae8b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt @@ -211,8 +211,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[colsInGroups][KProperty.colsInGroups]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsInGroups(predicate) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt index d9624ebcba..f86ed970f0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt @@ -159,8 +159,7 @@ public interface ColsOfColumnsSelectionDsl { * @include [CommonColsOfDocs.FilterParam] * @include [CommonColsOfDocs.Return] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsOf(type: KType, filter: ColumnFilter = { true }): ColumnSet<*> = columnGroup(this).colsOf(type, filter) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt index 4621420587..cf7920a5a2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt @@ -174,8 +174,7 @@ public interface ColsOfKindColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { Type::myColumnGroup.`[colsOfKind][KProperty.colsOfKind]`(`[Value][ColumnKind.Value]`, `[Frame][ColumnKind.Frame]`) }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsOfKind( kind: ColumnKind, vararg others: ColumnKind, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt index e02f55dee1..6c4fb013cc 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt @@ -189,8 +189,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameContains][KProperty.colsNameContains]`("my") }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsNameContains(text: CharSequence, ignoreCase: Boolean = false): ColumnSet<*> = columnGroup(this).colsNameContains(text, ignoreCase) @@ -252,8 +251,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameContains][KProperty.colsNameContains]`(`[Regex][Regex]`("order-[0-9]+")) }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsNameContains(regex: Regex): ColumnSet<*> = columnGroup(this).colsNameContains(regex) /** @@ -387,8 +385,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameStartsWith][KProperty.colsNameStartsWith]`("order-") }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsNameStartsWith(prefix: CharSequence, ignoreCase: Boolean = false): ColumnSet<*> = columnGroup(this).colsNameStartsWith(prefix, ignoreCase) @@ -468,8 +465,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameEndsWith][KProperty.colsNameEndsWith]`("-order") }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsNameEndsWith(suffix: CharSequence, ignoreCase: Boolean = false): ColumnSet<*> = columnGroup(this).colsNameEndsWith(suffix, ignoreCase) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt index d4446cdc3d..151e78b503 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt @@ -84,8 +84,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `"fromColumn"`[`..`][String.rangeTo]`Type::toColumn`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun String.rangeTo(endInclusive: KProperty<*>): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -100,8 +99,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `Type::fromColumn`[`..`][KProperty.rangeTo]`"toColumn"`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty<*>.rangeTo(endInclusive: String): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -109,8 +107,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `Type::fromColumn`[`..`][KProperty.rangeTo]`Type::toColumn`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty<*>.rangeTo(endInclusive: KProperty<*>): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -118,8 +115,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `Type::fromColumn`[`..`][KProperty.rangeTo]`toColumn`} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public operator fun KProperty<*>.rangeTo(endInclusive: AnyColumnReference): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/concat.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/concat.kt index 72af0f7014..16c052cad9 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/concat.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/concat.kt @@ -90,8 +90,7 @@ public fun GroupBy.concat(): DataFrame = groups.concat() * * @return A new [DataFrame] where all groups are combined and additional key columns are included in each row. */ -@Refine -@Interpretable("ConcatWithKeys") +@[Refine Interpretable("ConcatWithKeys")] public fun GroupBy.concatWithKeys(): DataFrame = mapToFrames { val rowsCount = group.rowsCount() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt index f24802969d..89d794f41d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt @@ -50,8 +50,7 @@ public fun column(name: String): ColumnAccessor = ColumnAccessorImpl(name public fun column(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(path) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun column(property: KProperty): ColumnAccessor = ColumnAccessorImpl(property.name) public fun ColumnGroupReference.column(): ColumnDelegate = ColumnDelegate(this) @@ -60,8 +59,7 @@ public fun ColumnGroupReference.column(name: String): ColumnAccessor = Co public fun ColumnGroupReference.column(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(this.path() + path) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnGroupReference.column(property: KProperty): ColumnAccessor = ColumnAccessorImpl(this.path() + property.name) @@ -98,8 +96,7 @@ public fun valueColumn(path: ColumnPath): ColumnAccessor = column(path) @JvmName("valueColumnTyped") public fun valueColumn(path: ColumnPath): ColumnAccessor = column(path) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun valueColumn(property: KProperty): ColumnAccessor = column(property.name) public fun ColumnGroupReference.valueColumn(): ColumnDelegate = ColumnDelegate(this) @@ -119,8 +116,7 @@ public fun ColumnGroupReference.valueColumn(path: ColumnPath): ColumnAccessor ColumnGroupReference.valueColumn(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(this.path() + path) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnGroupReference.valueColumn(property: KProperty): ColumnAccessor = ColumnAccessorImpl(this.path() + property.name) @@ -144,12 +140,10 @@ public fun columnGroup(path: ColumnPath): ColumnAccessor = column(path) public fun columnGroup(path: ColumnPath): ColumnAccessor> = column(path) @JvmName("columnGroupDataRowKProperty") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun columnGroup(property: KProperty>): ColumnAccessor> = column(property) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun columnGroup(property: KProperty): ColumnAccessor> = column(property.name) public fun ColumnGroupReference.columnGroup(): ColumnDelegate = ColumnDelegate(this) @@ -171,13 +165,11 @@ public fun ColumnGroupReference.columnGroup(path: ColumnPath): ColumnAccesso ColumnAccessorImpl(this.path() + path) @JvmName("columnGroupDataRowKProperty") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnGroupReference.columnGroup(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnGroupReference.columnGroup(property: KProperty): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) @@ -201,12 +193,10 @@ public fun frameColumn(path: ColumnPath): ColumnAccessor = column(path public fun frameColumn(path: ColumnPath): ColumnAccessor> = column(path) @JvmName("frameColumnDataFrameKProperty") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun frameColumn(property: KProperty>): ColumnAccessor> = column(property) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun frameColumn(property: KProperty>): ColumnAccessor> = column(property.name) public fun ColumnGroupReference.frameColumn(): ColumnDelegate = ColumnDelegate(this) @@ -228,13 +218,11 @@ public fun ColumnGroupReference.frameColumn(path: ColumnPath): ColumnAccesso ColumnAccessorImpl(this.path() + path) @JvmName("frameColumnDataFrameKProperty") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnGroupReference.frameColumn(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnGroupReference.frameColumn(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) @@ -270,8 +258,7 @@ public fun columnOf(vararg values: AnyBaseCol): DataColumn = columnOf(va * ) * ``` */ -@Refine -@Interpretable("ColumnOfPairs") +@[Refine Interpretable("ColumnOfPairs")] public fun columnOf(vararg columns: Pair): ColumnGroup<*> = dataFrameOf( columns.map { (name, col) -> @@ -355,8 +342,7 @@ public inline fun dataFrameOf( public fun dataFrameOf(header: Iterable): DataFrameBuilder = DataFrameBuilder(header.asList()) -@Refine -@Interpretable("DataFrameOf3") +@[Refine Interpretable("DataFrameOf3")] public fun dataFrameOf(vararg columns: Pair>): DataFrame<*> = columns.map { it.second.toColumn(it.first, Infer.Type) }.toDataFrame() @@ -387,8 +373,7 @@ public class DataFrameBuilder(private val header: List) { }.toDataFrame() } - @Refine - @Interpretable("DataFrameBuilderInvoke0") + @[Refine Interpretable("DataFrameBuilderInvoke0")] public operator fun invoke(vararg values: Any?): DataFrame<*> = withValues(values.asIterable()) @JvmName("invoke1") diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt index 20bb6e142d..1da3df27bd 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt @@ -241,8 +241,7 @@ private interface CommonConvertDocs @Interpretable("Convert0") public fun DataFrame.convert(columns: ColumnsSelector): Convert = Convert(this, columns) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.convert(vararg columns: KProperty): Convert = convert { columns.toColumnSet() } /** @@ -258,13 +257,11 @@ public fun DataFrame.convert(vararg columns: KProperty): Convert DataFrame.convert(vararg columns: String): Convert = convert { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.convert(vararg columns: ColumnReference): Convert = convert { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.convert( firstCol: ColumnReference, vararg cols: ColumnReference, @@ -272,8 +269,7 @@ public inline fun DataFrame.convert( noinline expression: RowValueExpression, ): DataFrame = convert(*headPlusArray(firstCol, cols)).with(infer, expression) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.convert( firstCol: KProperty, vararg cols: KProperty, @@ -299,8 +295,7 @@ public inline fun DataFrame.convert( * @param [expression] The {@include [ExpressionsGivenRow.RowValueExpressionLink]} to update the rows with. * @return A new [DataFrame] with the converted values. */ -@Refine -@Interpretable("Convert6") +@[Refine Interpretable("Convert6")] public inline fun DataFrame.convert( firstCol: String, vararg cols: String, @@ -308,8 +303,7 @@ public inline fun DataFrame.convert( noinline expression: RowValueExpression, ): DataFrame = convert(*headPlusArray(firstCol, cols)).with(infer, expression) -@Refine -@Interpretable("ConvertNotNull") +@[Refine Interpretable("ConvertNotNull")] public inline fun Convert.notNull( crossinline expression: RowValueExpression, ): DataFrame = @@ -382,8 +376,7 @@ public class Convert( * @param D The target type, provided as a reified type argument, to convert values to. * @return A new [DataFrame] with the values converted to type [D]. */ - @Refine - @Interpretable("To0") + @[Refine Interpretable("To0")] public inline fun to(): DataFrame = to(typeOf()) override fun toString(): String = "Convert(df=$df, columns=$columns)" @@ -452,8 +445,7 @@ private interface SeeAlsoConvertAsColumn * @param [rowConverter] The [RowValueExpression] to provide a new value for every selected cell giving its row and previous value. * @return A new [DataFrame] with the converted values. */ -@Refine -@Interpretable("With0") +@[Refine Interpretable("With0")] public inline fun Convert.with( infer: Infer = Infer.Nulls, noinline rowConverter: RowValueExpression, @@ -473,8 +465,7 @@ public inline fun Convert.with( * * @param [expression] The {@include [ExpressionsGivenDataFrame.DataFrameExpressionLink]} to replace the selected column group with. */ -@Refine -@Interpretable("ConvertAsFrame") +@[Refine Interpretable("ConvertAsFrame")] public fun Convert>.asFrame( expression: ColumnsContainer.(ColumnGroup) -> DataFrame, ): DataFrame = asColumn { expression(this, it.asColumnGroup()).asColumnGroup(it.name()) } @@ -510,8 +501,7 @@ public fun Convert>.asFrame( * * @return A new [DataFrame] with the values converted to [type]. */ -@Refine -@Interpretable("ConvertAsColumn") +@[Refine Interpretable("ConvertAsColumn")] public inline fun Convert.asColumn( crossinline columnConverter: DataFrame.(DataColumn) -> BaseColumn, ): DataFrame = df.replace(columns).with { columnConverter(df, it).rename(it.name()) } @@ -546,8 +536,7 @@ private interface SeeAlsoConvertWith * Defaults to [Infer.Nulls]. * @param [expression] The [RowColumnExpression] to provide a new value for every selected cell giving its row and column. */ -@Refine -@Interpretable("PerRowCol") +@[Refine Interpretable("PerRowCol")] public inline fun Convert.perRowCol( infer: Infer = Infer.Nulls, noinline expression: RowColumnExpression, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt index 4ef9458740..72d90303de 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt @@ -129,8 +129,7 @@ public data class Corr(internal val df: DataFrame, internal val columns * * @return A square correlation matrix as a [DataFrame], where both rows and columns correspond to the original columns. */ -@Refine -@Interpretable("DataFrameCorr") +@[Refine Interpretable("DataFrameCorr")] public fun DataFrame.corr(): DataFrame = corr { colsAtAnyDepth().filter { it.isSuitableForCorr() } @@ -184,12 +183,10 @@ public fun DataFrame.corr(columns: ColumnsSelector): Corr */ public fun DataFrame.corr(vararg columns: String): Corr = corr { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.corr(vararg columns: KProperty): Corr = corr { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.corr(vararg columns: ColumnReference): Corr = corr { columns.toColumnSet() } /** @@ -255,13 +252,11 @@ public fun Corr.with(otherColumns: ColumnsSelector): DataF */ public fun Corr.with(vararg otherColumns: String): DataFrame = with { otherColumns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Corr.with(vararg otherColumns: KProperty): DataFrame = with { otherColumns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Corr.with(vararg otherColumns: ColumnReference): DataFrame = with { otherColumns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/count.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/count.kt index 5acaf176d3..cf48bc4626 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/count.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/count.kt @@ -121,8 +121,7 @@ public inline fun DataFrame.count(predicate: RowFilter): Int = rows(). * @param resultName The name of the result column that will store the group sizes. Defaults to `"count"`. * @return A new [DataFrame] with group keys and corresponding group sizes. */ -@Refine -@Interpretable("GroupByCount0") +@[Refine Interpretable("GroupByCount0")] public fun Grouped.count(resultName: String = "count"): DataFrame = aggregateValue(resultName) { count() default 0 } @@ -154,8 +153,7 @@ public fun Grouped.count(resultName: String = "count"): DataFrame = * @param resultName The name of the result column containing the group sizes. Defaults to `"count"`. * @return A new [DataFrame] with group keys and filtered row counts per group. */ -@Refine -@Interpretable("GroupByCount0") +@[Refine Interpretable("GroupByCount0")] public inline fun Grouped.count( resultName: String = "count", crossinline predicate: RowFilter, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt index 2c05edff2f..8a425b6456 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt @@ -83,13 +83,11 @@ public fun DataFrame.countDistinct(columns: ColumnsSelector): In */ public fun DataFrame.countDistinct(vararg columns: String): Int = countDistinct { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.countDistinct(vararg columns: KProperty): Int = countDistinct { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.countDistinct(vararg columns: AnyColumnReference): Int = countDistinct { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt index cede3a6932..b0dc1d3e3a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt @@ -123,8 +123,7 @@ public fun DataColumn.cumSum(skipNA: Boolean = defaultCumSumSki * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [DataFrame]} */ -@Refine -@Interpretable("DataFrameCumSum") +@[Refine Interpretable("DataFrameCumSum")] public fun DataFrame.cumSum( skipNA: Boolean = defaultCumSumSkipNA, columns: ColumnsSelector, @@ -141,8 +140,7 @@ public fun DataFrame.cumSum(vararg columns: String, skipNA: Boolean = def * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [DataFrame]} */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.cumSum( vararg columns: ColumnReference, skipNA: Boolean = defaultCumSumSkipNA, @@ -152,8 +150,7 @@ public fun DataFrame.cumSum( * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [DataFrame]} */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.cumSum( vararg columns: KProperty, skipNA: Boolean = defaultCumSumSkipNA, @@ -164,8 +161,7 @@ public fun DataFrame.cumSum( * {@set [CumSumDocs.DATA_TYPE] [DataFrame]} * {@set [CumSumDocs.CUMSUM_PARAM]} */ -@Refine -@Interpretable("DataFrameCumSum0") +@[Refine Interpretable("DataFrameCumSum0")] public fun DataFrame.cumSum(skipNA: Boolean = defaultCumSumSkipNA): DataFrame = cumSum(skipNA) { colsAtAnyDepth().filter { it.isPrimitiveOrMixedNumber() }.cast() @@ -179,8 +175,7 @@ public fun DataFrame.cumSum(skipNA: Boolean = defaultCumSumSkipNA): DataF * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [GroupBy]} */ -@Refine -@Interpretable("GroupByCumSum") +@[Refine Interpretable("GroupByCumSum")] public fun GroupBy.cumSum( skipNA: Boolean = defaultCumSumSkipNA, columns: ColumnsSelector, @@ -197,8 +192,7 @@ public fun GroupBy.cumSum(vararg columns: String, skipNA: Boolean = * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [GroupBy]} */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.cumSum( vararg columns: ColumnReference, skipNA: Boolean = defaultCumSumSkipNA, @@ -208,8 +202,7 @@ public fun GroupBy.cumSum( * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [GroupBy]} */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.cumSum( vararg columns: KProperty, skipNA: Boolean = defaultCumSumSkipNA, @@ -220,8 +213,7 @@ public fun GroupBy.cumSum( * {@set [CumSumDocs.DATA_TYPE] [GroupBy]} * {@set [CumSumDocs.CUMSUM_PARAM]} */ -@Refine -@Interpretable("GroupByCumSum0") +@[Refine Interpretable("GroupByCumSum0")] public fun GroupBy.cumSum(skipNA: Boolean = defaultCumSumSkipNA): GroupBy = cumSum(skipNA) { colsAtAnyDepth().filter { it.isPrimitiveOrMixedNumber() }.cast() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt index eee25433e6..abfe935107 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt @@ -148,8 +148,7 @@ public fun DataFrame.describe(vararg columns: String): DataFrame DataFrame.describe(vararg columns: ColumnReference): DataFrame = describe { columns.toColumnSet() } @@ -159,8 +158,7 @@ public fun DataFrame.describe(vararg columns: ColumnReferenc * @param [columns] The [KProperties][KProperty] that specifies which * columns of this [DataFrame] should be described. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.describe(vararg columns: KProperty): DataFrame = describe { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt index e30f087a61..da65065c5f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt @@ -54,16 +54,14 @@ public fun DataFrame.distinct(): DataFrame = distinctBy { all() } * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Refine -@Interpretable("Distinct0") +@[Refine Interpretable("Distinct0")] public fun DataFrame.distinct(columns: ColumnsSelector): DataFrame = select(columns).distinct() /** * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.distinct(vararg columns: KProperty<*>): DataFrame = distinct { val set = columns.toColumnSet() @@ -80,8 +78,7 @@ public fun DataFrame.distinct(vararg columns: String): DataFrame = dis * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.distinct(vararg columns: AnyColumnReference): DataFrame = distinct { columns.toColumnSet() } @@ -89,8 +86,7 @@ public fun DataFrame.distinct(vararg columns: AnyColumnReference): DataFr * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.distinctBy(vararg columns: KProperty<*>): DataFrame = distinctBy { columns.toColumnSet() } @@ -104,8 +100,7 @@ public fun DataFrame.distinctBy(vararg columns: String): DataFrame = d * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.distinctBy(vararg columns: AnyColumnReference): DataFrame = distinctBy { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt index ddd3eda148..94ab2189b8 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt @@ -163,8 +163,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropCols][KProperty.dropCols]`(1) }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.dropCols(n: Int): ColumnSet<*> = columnGroup(this).dropCols(n) /** @@ -232,8 +231,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropLastCols][KProperty.dropLastCols]`(1) }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.dropLastCols(n: Int): ColumnSet<*> = columnGroup(this).dropLastCols(n) /** @@ -301,8 +299,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropColsWhile][KProperty.dropColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.dropColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).dropColsWhile(predicate) @@ -374,8 +371,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropLastColsWhile][KProperty.dropLastColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.dropLastColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).dropLastColsWhile(predicate) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt index 3792d50dbb..ea20bcdcbf 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt @@ -73,8 +73,7 @@ internal interface ExplodeDocs * If not specified, all applicable columns will be exploded. * @return A new [DataFrame] with exploded columns. */ -@Refine -@Interpretable("Explode0") +@[Refine Interpretable("Explode0")] public fun DataFrame.explode( dropEmpty: Boolean = true, selector: ColumnsSelector = defaultExplodeColumns, @@ -101,13 +100,11 @@ public fun DataFrame.explode( public fun DataFrame.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.explode(vararg columns: ColumnReference, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.explode(vararg columns: KProperty, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } @@ -185,13 +182,11 @@ public fun DataRow.explode( public fun DataRow.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataRow.explode(vararg columns: ColumnReference, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataRow.explode(vararg columns: KProperty, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt index 4b69ec5486..16fa546a72 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt @@ -84,13 +84,11 @@ public fun DataFrame.filterBy(column: ColumnSelector): DataFr public fun DataFrame.filterBy(column: String): DataFrame = filterBy { column.toColumnOf() } @Suppress("DEPRECATION_ERROR") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.filterBy(column: ColumnReference): DataFrame = filterBy { column } @Suppress("DEPRECATION_ERROR") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.filterBy(column: KProperty): DataFrame = filterBy { column.toColumnAccessor() } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt index 2af4812c44..4ffb035892 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt @@ -519,8 +519,7 @@ public interface FirstColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[firstCol][KProperty.firstCol]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.firstCol(condition: ColumnFilter<*> = { true }): SingleColumn<*> = columnGroup(this).firstCol(condition) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt index cde6796d5b..6ff82e128c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt @@ -57,8 +57,7 @@ private interface FlattenDocs { * {@set [FlattenDocs.GROUPS] all} * {@set [FlattenDocs.FLATTEN_PARAM]} */ -@Refine -@Interpretable("FlattenDefault") +@[Refine Interpretable("FlattenDefault")] public fun DataFrame.flatten(keepParentNameForColumns: Boolean = false, separator: String = "_"): DataFrame = flatten(keepParentNameForColumns, separator) { all() } @@ -66,8 +65,7 @@ public fun DataFrame.flatten(keepParentNameForColumns: Boolean = false, s * {@include [FlattenDocs]} * {@set [FlattenDocs.GROUPS] specified} */ -@Refine -@Interpretable("Flatten0") +@[Refine Interpretable("Flatten0")] public fun DataFrame.flatten( keepParentNameForColumns: Boolean = false, separator: String = "_", @@ -88,8 +86,7 @@ public fun DataFrame.flatten( * {@include [FlattenDocs]} * {@set [FlattenDocs.GROUPS] selected} */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.flatten( vararg columns: ColumnReference, keepParentNameForColumns: Boolean = false, @@ -100,8 +97,7 @@ public fun DataFrame.flatten( * {@include [FlattenDocs]} * {@set [FlattenDocs.GROUPS] selected} */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.flatten( vararg columns: KProperty, keepParentNameForColumns: Boolean = false, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt index fd1390ec2a..8d33a8662d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt @@ -293,13 +293,11 @@ public fun DataFrame.format(vararg columns: String): FormatClause DataFrame.format(): FormatClause = FormatClause(this) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.format(vararg columns: ColumnReference): FormatClause = format { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.format(vararg columns: KProperty): FormatClause = format { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt index 97ba869cff..7771187653 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt @@ -161,16 +161,14 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER]} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = frameCol.ensureIsFrameColumn() /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.frameCol( frameCol: ColumnAccessor>, ): SingleColumn> = @@ -186,8 +184,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.frameCol( frameCol: ColumnAccessor>, ): ColumnAccessor> = this.ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -195,24 +192,21 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -434,16 +428,14 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun frameCol(property: KProperty>): SingleColumn> = frameColumn(property).ensureIsFrameColumn() /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER]} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun frameCol(property: KProperty>): SingleColumn> = frameColumn(property).ensureIsFrameColumn() @@ -452,24 +444,21 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.frameCol(property: KProperty>): SingleColumn> = frameCol(property.name) /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.frameCol(property: KProperty>): SingleColumn> = frameCol(property.name) /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") public fun AnyColumnGroupAccessor.frameCol(property: KProperty>): ColumnAccessor> = @@ -478,8 +467,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.frameCol(property: KProperty>): ColumnAccessor> = this.ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -488,16 +476,14 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -506,16 +492,14 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -524,16 +508,14 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -619,16 +601,14 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.frameCol(index: Int): SingleColumn> = frameCol(index) /** * @include [FrameColIndexDocs] {@set [CommonFrameColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonFrameColDocs.FrameColumnTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.frameCol(index: Int): SingleColumn> = columnGroup(this).frameCol(index) /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt index f6da5e1d78..557de8e48b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt @@ -162,8 +162,7 @@ public interface FrameColsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup.`[frameCols][KProperty.frameCols]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.frameCols(filter: Predicate> = { true }): ColumnSet> = columnGroup(this).frameCols(filter) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt index 3e505c9885..3b61cfa1d9 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt @@ -148,13 +148,11 @@ public fun DataFrame.gather(selector: ColumnsSelector): Gather DataFrame.gather(vararg columns: String): Gather = gather { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.gather(vararg columns: ColumnReference): Gather = gather { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.gather(vararg columns: KProperty): Gather = gather { columns.toColumnSet() } @@ -491,20 +489,17 @@ public class Gather( * @param valueColumn The name of the column to store gathered values. * @return A new [DataFrame] with reshaped columns. */ -@Refine -@Interpretable("GatherInto") +@[Refine Interpretable("GatherInto")] public fun Gather.into(keyColumn: String, valueColumn: String): DataFrame = gatherImpl(keyColumn, valueColumn) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Gather.into( keyColumn: ColumnAccessor, valueColumn: ColumnAccessor, ): DataFrame = into(keyColumn.name(), valueColumn.name) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Gather.into(keyColumn: KProperty, valueColumn: KProperty): DataFrame = into(keyColumn.columnName, valueColumn.columnName) @@ -538,17 +533,14 @@ public fun Gather.into(keyColumn: KProperty, valueCo * @return A new [DataFrame] with reshaped columns. * @see [valuesInto] */ -@Refine -@Interpretable("GatherKeysInto") +@[Refine Interpretable("GatherKeysInto")] public fun Gather.keysInto(keyColumn: String): DataFrame = gatherImpl(keyColumn, null) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Gather.keysInto(keyColumn: ColumnAccessor): DataFrame = keysInto(keyColumn.name()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Gather.keysInto(keyColumn: KProperty): DataFrame = keysInto(keyColumn.columnName) @@ -583,17 +575,14 @@ public fun Gather.keysInto(keyColumn: KProperty): Da * @return A new [DataFrame] with reshaped columns. * @see [keysInto] */ -@Refine -@Interpretable("GatherValuesInto") +@[Refine Interpretable("GatherValuesInto")] public fun Gather.valuesInto(valueColumn: String): DataFrame = gatherImpl(null, valueColumn) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Gather.valuesInto(valueColumn: ColumnAccessor): DataFrame = valuesInto(valueColumn.name()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Gather.valuesInto(valueColumn: KProperty): DataFrame = valuesInto(valueColumn.columnName) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt index 6357f00e5e..3d61444448 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt @@ -114,13 +114,11 @@ public fun DataFrame.group(columns: ColumnsSelector): GroupClaus */ public fun DataFrame.group(vararg columns: String): GroupClause = group { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.group(vararg columns: AnyColumnReference): GroupClause = group { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.group(vararg columns: KProperty<*>): GroupClause = group { columns.toColumnSet() } // endregion @@ -234,16 +232,13 @@ public fun GroupClause.into( * @param [column] A [ColumnsSelector] that defines the path to a [ColumnGroup] * in the [DataFrame], where the selected columns will be moved. */ -@Refine -@Interpretable("Into0") +@[Refine Interpretable("Into0")] public fun GroupClause.into(column: String): DataFrame = into(columnGroup().named(column)) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupClause.into(column: AnyColumnGroupAccessor): DataFrame = df.move(columns).under(column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupClause.into(column: KProperty<*>): DataFrame = into(column.columnName) // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt index f8754efbe0..ea4a48a33b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt @@ -356,13 +356,11 @@ private interface CommonGroupByDocs * @return A new [GroupBy] containing the unique combinations of values from the provided [key columns][cols], * together with their corresponding groups of rows. */ -@Refine -@Interpretable("DataFrameGroupBy") +@[Refine Interpretable("DataFrameGroupBy")] public fun DataFrame.groupBy(moveToTop: Boolean = true, cols: ColumnsSelector): GroupBy = groupByImpl(moveToTop, cols) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.groupBy(vararg cols: KProperty<*>): GroupBy = groupBy { cols.toColumnSet() } /** @@ -376,8 +374,7 @@ public fun DataFrame.groupBy(vararg cols: KProperty<*>): GroupBy = */ public fun DataFrame.groupBy(vararg cols: String): GroupBy = groupBy { cols.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.groupBy(vararg cols: AnyColumnReference, moveToTop: Boolean = true): GroupBy = groupBy(moveToTop) { cols.toColumnSet() } @@ -419,8 +416,7 @@ private interface CommonGroupByForPivotDocs public fun Pivot.groupBy(moveToTop: Boolean = true, columns: ColumnsSelector): PivotGroupBy = (this as PivotImpl).toGroupedPivot(moveToTop, columns) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.groupBy(vararg columns: AnyColumnReference): PivotGroupBy = groupBy { columns.toColumnSet() } /** @@ -439,8 +435,7 @@ public fun Pivot.groupBy(vararg columns: AnyColumnReference): PivotGroupB */ public fun Pivot.groupBy(vararg columns: String): PivotGroupBy = groupBy { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.groupBy(vararg columns: KProperty<*>): PivotGroupBy = groupBy { columns.toColumnSet() } /** @@ -570,8 +565,7 @@ public interface GroupBy : Grouped { * @return A new [DataFrame] that includes the grouping key columns together * with a [FrameColumn] containing the corresponding groups. */ - @Refine - @Interpretable("GroupByToDataFrame") + @[Refine Interpretable("GroupByToDataFrame")] public fun toDataFrame(groupedColumnName: String? = null): DataFrame /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt index 81bc7095a4..80c4bf629b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt @@ -14,25 +14,21 @@ import kotlin.reflect.KProperty // region DataFrame -@Refine -@Interpretable("ImplodeDefault") +@[Refine Interpretable("ImplodeDefault")] public fun DataFrame.implode(dropNA: Boolean = false): DataRow = implode(dropNA) { all() }[0] -@Refine -@Interpretable("Implode") +@[Refine Interpretable("Implode")] public fun DataFrame.implode(dropNA: Boolean = false, columns: ColumnsSelector): DataFrame = implodeImpl(dropNA, columns) public fun DataFrame.implode(vararg columns: String, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.implode(vararg columns: ColumnReference, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.implode(vararg columns: KProperty, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt index 20679be29e..f2f117052b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt @@ -32,13 +32,11 @@ public fun DataFrame.inferType(columns: ColumnsSelector): DataFrame public fun DataFrame.inferType(vararg columns: String): DataFrame = inferType { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.inferType(vararg columns: ColumnReference<*>): DataFrame = inferType { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.inferType(vararg columns: KProperty<*>): DataFrame = inferType { columns.toColumnSet() } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt index c0454a6edd..712cf93b3f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt @@ -145,16 +145,14 @@ public inline fun DataFrame.insert( noinline expression: AddExpression, ): InsertClause = insert(mapToColumn(name, infer, expression)) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.insert( column: ColumnAccessor, infer: Infer = Infer.Nulls, noinline expression: AddExpression, ): InsertClause = insert(column.name(), infer, expression) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.insert( column: KProperty, infer: Infer = Infer.Nulls, @@ -212,8 +210,7 @@ public class InsertClause(internal val df: DataFrame, internal val column: * under which the new column will be inserted. * @return A new [DataFrame] with the inserted column placed under the selected group. */ -@Refine -@Interpretable("Under0") +@[Refine Interpretable("Under0")] public fun InsertClause.under(column: ColumnSelector): DataFrame = under(df.getColumnPath(column)) /** @@ -236,17 +233,14 @@ public fun InsertClause.under(column: ColumnSelector): DataFrame * under which the new column will be inserted. * @return A new [DataFrame] with the inserted column placed under the specified column group. */ -@Refine -@Interpretable("Under1") +@[Refine Interpretable("Under1")] public fun InsertClause.under(columnPath: ColumnPath): DataFrame = df.insertImpl(columnPath + column.name, column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun InsertClause.under(column: ColumnAccessor<*>): DataFrame = under(column.path()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun InsertClause.under(column: KProperty<*>): DataFrame = under(column.columnName) /** @@ -269,8 +263,7 @@ public fun InsertClause.under(column: KProperty<*>): DataFrame = under * If the group does not exist, it will be created. * @return A new [DataFrame] with the inserted column placed under the specified column group. */ -@Refine -@Interpretable("Under4") +@[Refine Interpretable("Under4")] public fun InsertClause.under(column: String): DataFrame = under(pathOf(column)) // endregion @@ -300,8 +293,7 @@ public fun InsertClause.under(column: String): DataFrame = under(pathO * after which the new column will be inserted. * @return A new [DataFrame] with the inserted column placed after the selected column. */ -@Refine -@Interpretable("InsertAfter0") +@[Refine Interpretable("InsertAfter0")] public fun InsertClause.after(column: ColumnSelector): DataFrame = afterImpl(df.getColumnPath(column)) /** @@ -326,12 +318,10 @@ public fun InsertClause.after(column: ColumnSelector): DataFrame */ public fun InsertClause.after(column: String): DataFrame = df.add(this.column).move(this.column).after(column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun InsertClause.after(column: ColumnAccessor<*>): DataFrame = afterImpl(column.path()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun InsertClause.after(column: KProperty<*>): DataFrame = after(column.columnName) @Deprecated(INSERT_AFTER_COL_PATH, ReplaceWith(INSERT_AFTER_COL_PATH_REPLACE), DeprecationLevel.ERROR) @@ -367,8 +357,7 @@ public fun InsertClause.after(columnPath: ColumnPath): DataFrame { * before which the new column will be inserted. * @return A new [DataFrame] with the inserted column placed before the selected column. */ -@Refine -@Interpretable("InsertBefore0") +@[Refine Interpretable("InsertBefore0")] public fun InsertClause.before(column: ColumnSelector): DataFrame = beforeImpl(df.getColumnPath(column)) /** @@ -418,8 +407,7 @@ public fun InsertClause.before(column: String): DataFrame = * Columns currently at this index and after will be shifted right. * @return A new [DataFrame] with the inserted column placed at the specified position. */ -@Refine -@Interpretable("InsertAt") +@[Refine Interpretable("InsertAt")] public fun InsertClause.at(position: Int): DataFrame = df.add(column).move(column).to(position) // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt index 285becb5f6..40abaa391a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt @@ -19,16 +19,13 @@ import kotlin.reflect.typeOf // region GroupBy -@Refine -@Interpretable("GroupByInto") +@[Refine Interpretable("GroupByInto")] public fun GroupBy.into(column: String): DataFrame = toDataFrame(column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.into(column: ColumnAccessor): DataFrame = toDataFrame(column.name()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.into(column: KProperty): DataFrame = toDataFrame(column.columnName) public inline fun GroupBy.into( @@ -37,8 +34,7 @@ public inline fun GroupBy.into( ): DataFrame = into(pathOf(columnName ?: groups.name()), expression, typeOf()) // @Hide -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun GroupBy.into( column: ColumnAccessor, noinline expression: RowExpression, @@ -60,8 +56,7 @@ internal fun GroupBy.into( internal().withExpr(type, path, expression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun GroupBy.into( column: KProperty, noinline expression: RowExpression, @@ -85,30 +80,25 @@ public inline fun ReducedGroupBy.into( } } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ReducedGroupBy.into( column: ColumnAccessor, noinline expression: RowExpression, ): DataFrame = into(column.name(), expression) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ReducedGroupBy.into( column: KProperty, noinline expression: RowExpression, ): DataFrame = into(column.columnName, expression) -@Refine -@Interpretable("GroupByReduceInto") +@[Refine Interpretable("GroupByReduceInto")] public fun ReducedGroupBy.into(columnName: String): DataFrame = into(columnName) { this } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedGroupBy.into(column: ColumnAccessor): DataFrame = into(column) { this } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedGroupBy.into(column: KProperty): DataFrame = into(column) { this } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt index 9d49458831..42c6ad1e1b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt @@ -111,8 +111,7 @@ private interface SelectingColumnsJoinDsl * if `null`, same-name columns are used. * @return joined [DataFrame]. */ -@Refine -@Interpretable("Join0") +@[Refine Interpretable("Join0")] public fun DataFrame.join( other: DataFrame, type: JoinType = JoinType.Inner, @@ -175,8 +174,7 @@ private interface InnerJoinDocs * if `null`, same-name columns are used. * @return joined [DataFrame]. */ -@Refine -@Interpretable("InnerJoin") +@[Refine Interpretable("InnerJoin")] public fun DataFrame.innerJoin( other: DataFrame, selector: JoinColumnsSelector? = null, @@ -224,8 +222,7 @@ private interface LeftJoinDocs * if `null`, same-name columns are used. * @return joined [DataFrame]. */ -@Refine -@Interpretable("LeftJoin") +@[Refine Interpretable("LeftJoin")] public fun DataFrame.leftJoin( other: DataFrame, selector: JoinColumnsSelector? = null, @@ -273,8 +270,7 @@ private interface RightJoinDocs * if `null`, same-name columns are used. * @return joined [DataFrame]. */ -@Refine -@Interpretable("RightJoin") +@[Refine Interpretable("RightJoin")] public fun DataFrame.rightJoin( other: DataFrame, selector: JoinColumnsSelector? = null, @@ -322,8 +318,7 @@ private interface FullJoinDocs * if `null`, same-name columns are used. * @return joined [DataFrame]. */ -@Refine -@Interpretable("FullJoin") +@[Refine Interpretable("FullJoin")] public fun DataFrame.fullJoin( other: DataFrame, selector: JoinColumnsSelector? = null, @@ -371,8 +366,7 @@ private interface FilterJoinDocs * if `null`, same-name columns are used. * @return joined [DataFrame]. */ -@Refine -@Interpretable("FilterJoin") +@[Refine Interpretable("FilterJoin")] public fun DataFrame.filterJoin( other: DataFrame, selector: JoinColumnsSelector? = null, @@ -420,8 +414,7 @@ private interface ExcludeJoinDocs * if `null`, same-name columns are used. * @return joined [DataFrame]. */ -@Refine -@Interpretable("ExcludeJoin") +@[Refine Interpretable("ExcludeJoin")] public fun DataFrame.excludeJoin( other: DataFrame, selector: JoinColumnsSelector? = null, @@ -495,18 +488,15 @@ public interface JoinDsl : ColumnsSelectionDsl { public infix fun String.match(other: String): ColumnMatch = ColumnMatch(toColumnAccessor(), other.toColumnAccessor()) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.match(other: KProperty): ColumnMatch = ColumnMatch(toColumnAccessor(), other.toColumnAccessor()) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnReference.match(other: KProperty): ColumnMatch = ColumnMatch(this, other.toColumnAccessor()) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.match(other: ColumnReference): ColumnMatch = ColumnMatch(toColumnAccessor(), other) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/joinWith.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/joinWith.kt index 87db6a0ba2..09f8f5e933 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/joinWith.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/joinWith.kt @@ -100,8 +100,7 @@ public typealias JoinExpression = Selector, Boolean> * @param [joinExpression] [JoinExpression] specifying the rows join condition. * @return joined [DataFrame]. */ -@Refine -@Interpretable("JoinWith") +@[Refine Interpretable("JoinWith")] public fun DataFrame.joinWith( right: DataFrame, type: JoinType = JoinType.Inner, @@ -130,8 +129,7 @@ public fun DataFrame.joinWith( * @param [joinExpression] [JoinExpression] specifying the rows join condition. * @return joined [DataFrame]. */ -@Refine -@Interpretable("InnerJoinWith") +@[Refine Interpretable("InnerJoinWith")] public fun DataFrame.innerJoinWith(right: DataFrame, joinExpression: JoinExpression): DataFrame = joinWith(right, JoinType.Inner, joinExpression) @@ -157,8 +155,7 @@ public fun DataFrame.innerJoinWith(right: DataFrame, joinExpression * @param [joinExpression] [JoinExpression] specifying the rows join condition. * @return joined [DataFrame]. */ -@Refine -@Interpretable("LeftJoinWith") +@[Refine Interpretable("LeftJoinWith")] public fun DataFrame.leftJoinWith(right: DataFrame, joinExpression: JoinExpression): DataFrame = joinWith(right, JoinType.Left, joinExpression) @@ -184,8 +181,7 @@ public fun DataFrame.leftJoinWith(right: DataFrame, joinExpression: * @param [joinExpression] [JoinExpression] specifying the rows join condition. * @return joined [DataFrame]. */ -@Refine -@Interpretable("RightJoinWith") +@[Refine Interpretable("RightJoinWith")] public fun DataFrame.rightJoinWith(right: DataFrame, joinExpression: JoinExpression): DataFrame = joinWith(right, JoinType.Right, joinExpression) @@ -211,8 +207,7 @@ public fun DataFrame.rightJoinWith(right: DataFrame, joinExpression * @param [joinExpression] [JoinExpression] specifying the rows join condition. * @return joined [DataFrame]. */ -@Refine -@Interpretable("FullJoinWith") +@[Refine Interpretable("FullJoinWith")] public fun DataFrame.fullJoinWith(right: DataFrame, joinExpression: JoinExpression): DataFrame = joinWith(right, JoinType.Full, joinExpression) @@ -238,8 +233,7 @@ public fun DataFrame.fullJoinWith(right: DataFrame, joinExpression: * @param [joinExpression] [JoinExpression] specifying the rows join condition. * @return joined [DataFrame]. */ -@Refine -@Interpretable("FilterJoinWith") +@[Refine Interpretable("FilterJoinWith")] public fun DataFrame.filterJoinWith(right: DataFrame, joinExpression: JoinExpression): DataFrame = joinWithImpl(right, JoinType.Filter, addNewColumns = false, joinExpression) @@ -265,8 +259,7 @@ public fun DataFrame.filterJoinWith(right: DataFrame, joinExpressio * @param [joinExpression] [JoinExpression] specifying the rows join condition. * @return joined [DataFrame]. */ -@Refine -@Interpretable("ExcludeJoinWith") +@[Refine Interpretable("ExcludeJoinWith")] public fun DataFrame.excludeJoinWith( right: DataFrame, joinExpression: JoinExpression, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt index 5e9a5db8ea..23ab94db80 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt @@ -514,8 +514,7 @@ public interface LastColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[lastCol][KProperty.lastCol]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.lastCol(condition: ColumnFilter<*> = { true }): SingleColumn<*> = columnGroup(this).lastCol(condition) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt index 02113133d5..caa9483d12 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt @@ -24,8 +24,7 @@ import kotlin.reflect.typeOf // region ColumnReference -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] internal inline fun ColumnReference.map( infer: Infer = Infer.Nulls, noinline transform: (C) -> R, @@ -95,16 +94,14 @@ public inline fun ColumnsContainer.mapToColumn( noinline body: AddExpression, ): DataColumn = mapToColumn(name, typeOf(), infer, body) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ColumnsContainer.mapToColumn( column: ColumnReference, infer: Infer = Infer.Nulls, noinline body: AddExpression, ): DataColumn = mapToColumn(column, typeOf(), infer, body) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ColumnsContainer.mapToColumn( column: KProperty, infer: Infer = Infer.Nulls, @@ -119,8 +116,7 @@ internal fun ColumnsContainer.mapToColumn( body: AddExpression, ): DataColumn = newColumn(type, name, infer, body) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.mapToColumn( column: ColumnReference, type: KType, @@ -128,8 +124,7 @@ public fun ColumnsContainer.mapToColumn( body: AddExpression, ): DataColumn = mapToColumn(column.name(), type, infer, body) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnsContainer.mapToColumn( column: KProperty, type: KType, @@ -137,8 +132,7 @@ public fun ColumnsContainer.mapToColumn( body: AddExpression, ): DataColumn = mapToColumn(column.columnName, type, infer, body) -@Refine -@Interpretable("MapToFrame") +@[Refine Interpretable("MapToFrame")] public inline fun DataFrame.mapToFrame(body: AddDsl.() -> Unit): AnyFrame { val dsl = AddDsl(this) body(dsl) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt index d1ff0cd1e2..d865e5ad3d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt @@ -74,13 +74,11 @@ public inline fun > AnyRow.rowMaxOf(skipNaN: Boolean = // endregion // region DataFrame -@Refine -@Interpretable("Max0") +@[Refine Interpretable("Max0")] public fun DataFrame.max(skipNaN: Boolean = skipNaNDefault): DataRow = maxFor(skipNaN, intraComparableColumns()) -@Refine -@Interpretable("Max1") +@[Refine Interpretable("Max1")] public fun ?> DataFrame.maxFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -89,15 +87,13 @@ public fun ?> DataFrame.maxFor( public fun DataFrame.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = maxFor(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.maxFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.maxFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -111,15 +107,13 @@ public fun ?> DataFrame.max( public fun DataFrame.max(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable = maxOrNull(*columns, skipNaN = skipNaN).suggestIfNull("max") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.max( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C & Any = maxOrNull(*columns, skipNaN = skipNaN).suggestIfNull("max") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.max( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -133,15 +127,13 @@ public fun ?> DataFrame.maxOrNull( public fun DataFrame.maxOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable? = maxOrNull(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.maxOrNull( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C? = maxOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.maxOrNull( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -165,15 +157,13 @@ public inline fun ?> DataFrame.maxBy( public fun DataFrame.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = maxByOrNull(column, skipNaN).suggestIfNull("maxBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.maxBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = maxByOrNull(column, skipNaN).suggestIfNull("maxBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.maxBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -187,15 +177,13 @@ public inline fun ?> DataFrame.maxByOrNull public fun DataFrame.maxByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = maxByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.maxByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.max(skipNaN).aggregateByOrNull(this, column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.maxByOrNull( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -205,13 +193,11 @@ public inline fun ?> DataFrame.maxByOrNull // region GroupBy -@Refine -@Interpretable("GroupByMax1") +@[Refine Interpretable("GroupByMax1")] public fun Grouped.max(skipNaN: Boolean = skipNaNDefault): DataFrame = maxFor(skipNaN, intraComparableColumns()) -@Refine -@Interpretable("GroupByMax0") +@[Refine Interpretable("GroupByMax0")] public fun ?> Grouped.maxFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -220,22 +206,19 @@ public fun ?> Grouped.maxFor( public fun Grouped.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = maxFor(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.maxFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.maxFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMax2") +@[Refine Interpretable("GroupByMax2")] public fun ?> Grouped.max( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -248,24 +231,21 @@ public fun Grouped.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(name, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.max( vararg columns: ColumnReference, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(name, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.max( vararg columns: KProperty, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(name, skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMaxOf") +@[Refine Interpretable("GroupByMaxOf")] public inline fun ?> Grouped.maxOf( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -278,8 +258,7 @@ public inline fun ?> GroupBy.maxBy( crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.maxBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -288,8 +267,7 @@ public inline fun ?> GroupBy.maxBy( public fun GroupBy.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.maxBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -314,16 +292,14 @@ public fun Pivot.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.maxFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.maxFor( vararg columns: KProperty, separate: Boolean = false, @@ -338,15 +314,13 @@ public fun ?> Pivot.max( public fun Pivot.max(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = max(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.max( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = max(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.max( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -362,8 +336,7 @@ public inline fun ?> Pivot.maxBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.maxBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -372,8 +345,7 @@ public inline fun ?> Pivot.maxBy( public fun Pivot.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.maxBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -398,16 +370,14 @@ public fun PivotGroupBy.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.maxFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.maxFor( vararg columns: KProperty, separate: Boolean = false, @@ -427,8 +397,7 @@ public fun ?> PivotGroupBy.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.max( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -444,8 +413,7 @@ public inline fun ?> PivotGroupBy.maxBy( crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.maxBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -454,8 +422,7 @@ public inline fun ?> PivotGroupBy.maxBy( public fun PivotGroupBy.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.maxBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt index 892326763d..8a7618e6d1 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt @@ -61,13 +61,11 @@ public inline fun AnyRow.rowMeanOf(skipNaN: Boolean = skipN // endregion // region DataFrame -@Refine -@Interpretable("Mean0") +@[Refine Interpretable("Mean0")] public fun DataFrame.mean(skipNaN: Boolean = skipNaNDefault): DataRow = meanFor(skipNaN, primitiveOrMixedNumberColumns()) -@Refine -@Interpretable("Mean1") +@[Refine Interpretable("Mean1")] public fun DataFrame.meanFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -76,15 +74,13 @@ public fun DataFrame.meanFor( public fun DataFrame.meanFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = meanFor(skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.meanFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = meanFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.meanFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -98,15 +94,13 @@ public fun DataFrame.mean( public fun DataFrame.mean(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Double = mean(skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.mean( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): Double = mean(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.mean( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -120,13 +114,11 @@ public inline fun DataFrame.meanOf( // endregion // region GroupBy -@Refine -@Interpretable("GroupByMean1") +@[Refine Interpretable("GroupByMean1")] public fun Grouped.mean(skipNaN: Boolean = skipNaNDefault): DataFrame = meanFor(skipNaN, primitiveOrMixedNumberColumns()) -@Refine -@Interpretable("GroupByMean0") +@[Refine Interpretable("GroupByMean0")] public fun Grouped.meanFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -135,22 +127,19 @@ public fun Grouped.meanFor( public fun Grouped.meanFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = meanFor(skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.meanFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.meanFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMean2") +@[Refine Interpretable("GroupByMean2")] public fun Grouped.mean( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -163,24 +152,21 @@ public fun Grouped.mean( skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(name, skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.mean( vararg columns: ColumnReference, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(name, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.mean( vararg columns: KProperty, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(name, skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMeanOf") +@[Refine Interpretable("GroupByMeanOf")] public inline fun Grouped.meanOf( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -206,16 +192,14 @@ public fun Pivot.meanFor( separate: Boolean = false, ): DataRow = meanFor(skipNaN, separate) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.meanFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, separate: Boolean = false, ): DataRow = meanFor(skipNaN, separate) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.meanFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -251,16 +235,14 @@ public fun PivotGroupBy.meanFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN, separate) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.meanFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN, separate) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.meanFor( vararg columns: KProperty, separate: Boolean = false, @@ -275,15 +257,13 @@ public fun PivotGroupBy.mean( public fun PivotGroupBy.mean(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = mean(skipNaN) { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.mean( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.mean( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt index 576a17ea18..45c30eb4f5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt @@ -133,13 +133,11 @@ public inline fun AnyRow.rowMedianOf( // endregion // region DataFrame -@Refine -@Interpretable("Median0") +@[Refine Interpretable("Median0")] public fun DataFrame.median(skipNaN: Boolean = skipNaNDefault): DataRow = medianFor(skipNaN, intraComparableColumns()) -@Refine -@Interpretable("Median1") +@[Refine Interpretable("Median1")] public fun ?> DataFrame.medianFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -148,15 +146,13 @@ public fun ?> DataFrame.medianFor( public fun DataFrame.medianFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = medianFor(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.medianFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.medianFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -195,18 +191,15 @@ public fun DataFrame.median(vararg columns: String, skipNaN: Boolean = sk public fun DataFrame.medianOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Any? = Aggregators.medianCommon?>(skipNaN).aggregateAll(this) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.median(vararg columns: ColumnReference): C & Any = medianOrNull(*columns).suggestIfNull("median") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.medianOrNull(vararg columns: ColumnReference): C? = medianOrNull { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.median( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -214,26 +207,22 @@ public fun DataFrame.median( where C : Comparable?, C : Number? = medianOrNull(*columns, skipNaN = skipNaN).suggestIfNull("median") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.medianOrNull( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): Double? where C : Comparable?, C : Number? = medianOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.median(vararg columns: KProperty): C & Any = medianOrNull(*columns).suggestIfNull("median") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.medianOrNull(vararg columns: KProperty): C? = medianOrNull { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.median( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -241,8 +230,7 @@ public fun DataFrame.median( where C : Comparable?, C : Number? = medianOrNull(*columns, skipNaN = skipNaN).suggestIfNull("median") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.medianOrNull( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -285,15 +273,13 @@ public inline fun ?> DataFrame.medianBy( public fun DataFrame.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = medianByOrNull(column, skipNaN).suggestIfNull("medianBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.medianBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = medianByOrNull(column, skipNaN).suggestIfNull("medianBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.medianBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -307,15 +293,13 @@ public inline fun ?> DataFrame.medianByOrN public fun DataFrame.medianByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = medianByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.medianByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.medianCommon(skipNaN).aggregateByOrNull(this, column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.medianByOrNull( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -324,13 +308,11 @@ public inline fun ?> DataFrame.medianByOrN // endregion // region GroupBy -@Refine -@Interpretable("GroupByMedian1") +@[Refine Interpretable("GroupByMedian1")] public fun Grouped.median(skipNaN: Boolean = skipNaNDefault): DataFrame = medianFor(skipNaN, intraComparableColumns()) -@Refine -@Interpretable("GroupByMedian0") +@[Refine Interpretable("GroupByMedian0")] public fun ?> Grouped.medianFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -338,22 +320,19 @@ public fun ?> Grouped.medianFor( public fun Grouped.medianFor(vararg columns: String): DataFrame = medianFor { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.medianFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.medianFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMedian2") +@[Refine Interpretable("GroupByMedian2")] public fun ?> Grouped.median( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -366,24 +345,21 @@ public fun Grouped.median( skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(name, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.median( vararg columns: ColumnReference, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(name, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.median( vararg columns: KProperty, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(name, skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMedianOf") +@[Refine Interpretable("GroupByMedianOf")] public inline fun ?> Grouped.medianOf( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -396,8 +372,7 @@ public inline fun ?> GroupBy.medianB crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.medianBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -406,8 +381,7 @@ public inline fun ?> GroupBy.medianB public fun GroupBy.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.medianBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -432,16 +406,14 @@ public fun Pivot.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.medianFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.medianFor( vararg columns: KProperty, separate: Boolean = false, @@ -456,15 +428,13 @@ public fun ?> Pivot.median( public fun Pivot.median(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = median(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.median( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = median(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.median( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -480,8 +450,7 @@ public inline fun ?> Pivot.medianBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.medianBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -490,8 +459,7 @@ public inline fun ?> Pivot.medianBy( public fun Pivot.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.medianBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -515,16 +483,14 @@ public fun PivotGroupBy.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.medianFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.medianFor( vararg columns: KProperty, separate: Boolean = false, @@ -539,15 +505,13 @@ public fun ?> PivotGroupBy.median( public fun PivotGroupBy.median(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = median(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.median( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.median( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -563,8 +527,7 @@ public inline fun ?> PivotGroupBy.medianBy crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.medianBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -573,8 +536,7 @@ public inline fun ?> PivotGroupBy.medianBy public fun PivotGroupBy.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.medianBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt index 8760762763..845e5a5181 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt @@ -25,13 +25,11 @@ public fun DataFrame.merge(selector: ColumnsSelector): Merge DataFrame.merge(vararg columns: String): Merge> = merge { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.merge(vararg columns: ColumnReference): Merge> = merge { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun DataFrame.merge(vararg columns: KProperty): Merge> = merge { columns.toColumnSet() } @@ -67,20 +65,16 @@ public fun Merge.notNull(): Merge = copy(notNu public fun Merge>.notNull(): Merge> = copy(notNull = true) as Merge> -@Refine -@Interpretable("MergeInto0") +@[Refine Interpretable("MergeInto0")] public fun MergeWithTransform.into(columnName: String): DataFrame = into(pathOf(columnName)) -@Refine -@Interpretable("MergeInto0") +@[Refine Interpretable("MergeInto0")] public fun Merge.into(columnName: String): DataFrame = into(pathOf(columnName)) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun Merge.into(column: ColumnAccessor<*>): DataFrame = into(column.path()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun MergeWithTransform.into(column: ColumnAccessor<*>): DataFrame = into(column.path()) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt index 6246e7205c..47647ec687 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt @@ -74,13 +74,11 @@ public inline fun > AnyRow.rowMinOf(skipNaN: Boolean = // endregion // region DataFrame -@Refine -@Interpretable("Min0") +@[Refine Interpretable("Min0")] public fun DataFrame.min(skipNaN: Boolean = skipNaNDefault): DataRow = minFor(skipNaN, intraComparableColumns()) -@Refine -@Interpretable("Min1") +@[Refine Interpretable("Min1")] public fun ?> DataFrame.minFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -89,15 +87,13 @@ public fun ?> DataFrame.minFor( public fun DataFrame.minFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = minFor(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.minFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.minFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -111,15 +107,13 @@ public fun ?> DataFrame.min( public fun DataFrame.min(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable = minOrNull(*columns, skipNaN = skipNaN).suggestIfNull("min") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.min( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C & Any = minOrNull(*columns, skipNaN = skipNaN).suggestIfNull("min") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.min( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -133,15 +127,13 @@ public fun ?> DataFrame.minOrNull( public fun DataFrame.minOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable? = minOrNull(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.minOrNull( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C? = minOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.minOrNull( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -165,15 +157,13 @@ public inline fun ?> DataFrame.minBy( public fun DataFrame.minBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = minByOrNull(column, skipNaN).suggestIfNull("minBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.minBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = minByOrNull(column, skipNaN).suggestIfNull("minBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.minBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -187,15 +177,13 @@ public inline fun ?> DataFrame.minByOrNull public fun DataFrame.minByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = minByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.minByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.min(skipNaN).aggregateByOrNull(this, column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.minByOrNull( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -205,13 +193,11 @@ public inline fun ?> DataFrame.minByOrNull // region GroupBy -@Refine -@Interpretable("GroupByMin1") +@[Refine Interpretable("GroupByMin1")] public fun Grouped.min(skipNaN: Boolean = skipNaNDefault): DataFrame = minFor(skipNaN, intraComparableColumns()) -@Refine -@Interpretable("GroupByMin0") +@[Refine Interpretable("GroupByMin0")] public fun ?> Grouped.minFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -220,22 +206,19 @@ public fun ?> Grouped.minFor( public fun Grouped.minFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = minFor(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.minFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.minFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMin2") +@[Refine Interpretable("GroupByMin2")] public fun ?> Grouped.min( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -248,24 +231,21 @@ public fun Grouped.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(name, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.min( vararg columns: ColumnReference, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(name, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.min( vararg columns: KProperty, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(name, skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByMinOf") +@[Refine Interpretable("GroupByMinOf")] public inline fun ?> Grouped.minOf( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -278,8 +258,7 @@ public inline fun ?> GroupBy.minBy( crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.minBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -288,8 +267,7 @@ public inline fun ?> GroupBy.minBy( public fun GroupBy.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.minBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -314,16 +292,14 @@ public fun Pivot.minFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.minFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.minFor( vararg columns: KProperty, separate: Boolean = false, @@ -338,15 +314,13 @@ public fun ?> Pivot.min( public fun Pivot.min(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = min(skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.min( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = min(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.min( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -362,8 +336,7 @@ public inline fun ?> Pivot.minBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.minBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -372,8 +345,7 @@ public inline fun ?> Pivot.minBy( public fun Pivot.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.minBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -398,16 +370,14 @@ public fun PivotGroupBy.minFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.minFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.minFor( vararg columns: KProperty, separate: Boolean = false, @@ -427,8 +397,7 @@ public fun ?> PivotGroupBy.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.min( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -444,8 +413,7 @@ public inline fun ?> PivotGroupBy.minBy( crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.minBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -454,8 +422,7 @@ public inline fun ?> PivotGroupBy.minBy( public fun PivotGroupBy.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.minBy( column: KProperty, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt index cd4aed1adb..145ce764e9 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt @@ -135,13 +135,11 @@ public fun DataFrame.move(columns: ColumnsSelector): MoveClause< */ public fun DataFrame.move(vararg columns: String): MoveClause = move { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.move(vararg columns: ColumnReference): MoveClause = move { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.move(vararg columns: KProperty): MoveClause = move { columns.toColumnSet() } // endregion @@ -191,8 +189,7 @@ private interface CommonMoveToDocs * where the selected columns will be moved. * @param [columns\] The [Columns Selector][ColumnsSelector] used to select the columns of this [DataFrame] to move. */ -@Refine -@Interpretable("MoveTo1") +@[Refine Interpretable("MoveTo1")] public fun DataFrame.moveTo(newColumnIndex: Int, columns: ColumnsSelector): DataFrame = move(columns).to(newColumnIndex) @@ -211,13 +208,11 @@ public fun DataFrame.moveTo(newColumnIndex: Int, columns: ColumnsSelector public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: String): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: AnyColumnReference): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: KProperty<*>): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } @@ -240,8 +235,7 @@ public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: KPropert * else they will be moved to the top level. * @param [columns\] The [Columns Selector][ColumnsSelector] used to select the columns of this [DataFrame] to move. */ -@Refine -@Interpretable("MoveTo1") +@[Refine Interpretable("MoveTo1")] public fun DataFrame.moveTo( newColumnIndex: Int, insideGroup: Boolean, @@ -311,8 +305,7 @@ public fun DataFrame.moveToLeft(columns: ColumnsSelector): DataFram * @include [SelectingColumns.Dsl.WithExample] {@include [SetMoveToStartOperationArg]} * @param [columns\] The [Columns Selector][ColumnsSelector] used to select the columns of this [DataFrame] to move. */ -@Refine -@Interpretable("MoveToStart1") +@[Refine Interpretable("MoveToStart1")] public fun DataFrame.moveToStart(columns: ColumnsSelector): DataFrame = move(columns).toStart() /** @@ -322,8 +315,7 @@ public fun DataFrame.moveToStart(columns: ColumnsSelector): DataFra * @param [insideGroup] If true, selected columns will be moved to the start remaining inside their group, * else they will be moved to the start of the top level. */ -@Refine -@Interpretable("MoveToStart1") +@[Refine Interpretable("MoveToStart1")] public fun DataFrame.moveToStart(insideGroup: Boolean, columns: ColumnsSelector): DataFrame = move(columns).toStart(insideGroup) @@ -352,8 +344,7 @@ public fun DataFrame.moveToStart(insideGroup: Boolean, vararg columns: St public fun DataFrame.moveToLeft(vararg columns: AnyColumnReference): DataFrame = moveToStart { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.moveToStart(vararg columns: AnyColumnReference): DataFrame = moveToStart { columns.toColumnSet() } @@ -362,8 +353,7 @@ public fun DataFrame.moveToStart(vararg columns: AnyColumnReference): Dat public fun DataFrame.moveToLeft(vararg columns: KProperty<*>): DataFrame = moveToStart { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.moveToStart(vararg columns: KProperty<*>): DataFrame = moveToStart { columns.toColumnSet() } @@ -408,8 +398,7 @@ public fun DataFrame.moveToRight(columns: ColumnsSelector): DataFra * @include [SelectingColumns.Dsl.WithExample] {@include [SetMoveToEndOperationArg]} * @param [columns\] The [Columns Selector][ColumnsSelector] used to select the columns of this [DataFrame] to move. */ -@Refine -@Interpretable("MoveToEnd1") +@[Refine Interpretable("MoveToEnd1")] public fun DataFrame.moveToEnd(columns: ColumnsSelector): DataFrame = move(columns).toEnd() /** @@ -419,8 +408,7 @@ public fun DataFrame.moveToEnd(columns: ColumnsSelector): DataFrame * @param [insideGroup] If true, selected columns will be moved to the end remaining inside their group, * else they will be moved to the end of the top level. */ -@Refine -@Interpretable("MoveToEnd1") +@[Refine Interpretable("MoveToEnd1")] public fun DataFrame.moveToEnd(insideGroup: Boolean, columns: ColumnsSelector): DataFrame = move(columns).toEnd(insideGroup) @@ -449,8 +437,7 @@ public fun DataFrame.moveToEnd(insideGroup: Boolean, vararg columns: Stri public fun DataFrame.moveToRight(vararg columns: AnyColumnReference): DataFrame = moveToEnd { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.moveToEnd(vararg columns: AnyColumnReference): DataFrame = moveToEnd { columns.toColumnSet() } @@ -459,8 +446,7 @@ public fun DataFrame.moveToEnd(vararg columns: AnyColumnReference): DataF public fun DataFrame.moveToRight(vararg columns: KProperty<*>): DataFrame = moveToEnd { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.moveToEnd(vararg columns: KProperty<*>): DataFrame = moveToEnd { columns.toColumnSet() } // endregion @@ -516,8 +502,7 @@ public fun MoveClause.into( * @param column The new [String] name of the column after the move. * @return A new [DataFrame] with the column moved and renamed. */ -@Refine -@Interpretable("MoveInto0") +@[Refine Interpretable("MoveInto0")] public fun MoveClause.into(column: String): DataFrame = pathOf(column).let { path -> into { path } } /** @@ -575,12 +560,10 @@ public fun MoveClause.intoIndexed( * @param [column] A [ColumnsSelector] that defines the path to a [ColumnGroup] * in the [DataFrame], where the selected columns will be moved. */ -@Refine -@Interpretable("MoveUnder0") +@[Refine Interpretable("MoveUnder0")] public fun MoveClause.under(column: String): DataFrame = pathOf(column).let { path -> under { path } } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun MoveClause.under(column: AnyColumnGroupAccessor): DataFrame = column.path().let { path -> under { path } } @@ -608,8 +591,7 @@ public fun MoveClause.under(column: AnyColumnGroupAccessor): DataFr * @param [column] The [ColumnsSelector] that defines the path to a [ColumnGroup] * in the [DataFrame], where the selected columns will be moved. */ -@Refine -@Interpretable("MoveUnder1") +@[Refine Interpretable("MoveUnder1")] public fun MoveClause.under( column: ColumnsSelectionDsl.(ColumnWithPath) -> AnyColumnReference, ): DataFrame = @@ -639,8 +621,7 @@ public fun MoveClause.under( * @param [columnIndex] The index specifying the position in the [DataFrame] columns * * where the selected columns will be moved. */ -@Refine -@Interpretable("MoveTo") +@[Refine Interpretable("MoveTo")] public fun MoveClause.to(columnIndex: Int): DataFrame = moveTo(columnIndex) /** @@ -664,8 +645,7 @@ public fun MoveClause.to(columnIndex: Int): DataFrame = moveTo(c * @param [insideGroup] If true, selected columns will be moved remaining inside their group, * else they will be moved to the top level. */ -@Refine -@Interpretable("MoveTo") +@[Refine Interpretable("MoveTo")] public fun MoveClause.to(columnIndex: Int, insideGroup: Boolean): DataFrame = moveToImpl(columnIndex, insideGroup) @@ -688,8 +668,7 @@ public fun MoveClause.to(columnIndex: Int, insideGroup: Boolean): D * @param [newColumnName] The special [ColumnsSelector] for define name of moved column. * Optional, the original name is used by default */ -@Refine -@Interpretable("ToTop") +@[Refine Interpretable("ToTop")] public fun MoveClause.toTop( newColumnName: ColumnsSelectionDsl.(ColumnWithPath) -> String = { it.name() }, ): DataFrame = into { newColumnName(it).toColumnAccessor() } @@ -726,8 +705,7 @@ internal interface MoveAfter * @param [column] A [ColumnSelector] specifying the column * after which the selected columns will be placed. */ -@Refine -@Interpretable("MoveAfter0") +@[Refine Interpretable("MoveAfter0")] public fun MoveClause.after(column: ColumnSelector): DataFrame = afterOrBefore(column, true) /** @@ -743,12 +721,10 @@ public fun MoveClause.after(column: ColumnSelector): DataFram */ public fun MoveClause.after(column: String): DataFrame = after { column.toColumnAccessor() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun MoveClause.after(column: AnyColumnReference): DataFrame = after { column } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun MoveClause.after(column: KProperty<*>): DataFrame = after { column.toColumnAccessor() } // endregion @@ -783,8 +759,7 @@ internal interface MoveBefore * @param [column] A [ColumnSelector] specifying the column * before which the selected columns will be placed. */ -@Refine -@Interpretable("MoveBefore0") +@[Refine Interpretable("MoveBefore0")] public fun MoveClause.before(column: ColumnSelector): DataFrame = afterOrBefore(column, false) /** @@ -819,8 +794,7 @@ public fun MoveClause.toLeft(): DataFrame = to(0) * df.move("age", "weight").toStart() * ``` */ -@Refine -@Interpretable("MoveToStart0") +@[Refine Interpretable("MoveToStart0")] public fun MoveClause.toStart(): DataFrame = to(0) /** @@ -841,8 +815,7 @@ public fun MoveClause.toStart(): DataFrame = to(0) * @param [insideGroup] If true, selected columns will be moved to the start remaining inside their group, * else they will be moved to the start on top level. */ -@Refine -@Interpretable("MoveToStart0") +@[Refine Interpretable("MoveToStart0")] public fun MoveClause.toStart(insideGroup: Boolean): DataFrame = to(0, insideGroup) @Deprecated(TO_RIGHT, ReplaceWith(TO_RIGHT_REPLACE), DeprecationLevel.ERROR) @@ -862,8 +835,7 @@ public fun MoveClause.toRight(): DataFrame = to(df.ncol) * df.move("age", "weight").toEnd() * ``` */ -@Refine -@Interpretable("MoveToEnd0") +@[Refine Interpretable("MoveToEnd0")] public fun MoveClause.toEnd(): DataFrame = to(df.ncol) /** @@ -884,8 +856,7 @@ public fun MoveClause.toEnd(): DataFrame = to(df.ncol) * @param [insideGroup] If true, selected columns will be moved to the end remaining inside their group, * else they will be moved to the end on top level. */ -@Refine -@Interpretable("MoveToEnd0") +@[Refine Interpretable("MoveToEnd0")] public fun MoveClause.toEnd(insideGroup: Boolean): DataFrame = to(df.ncol, insideGroup) /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt index c7e74f3b68..444a00fdf1 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt @@ -39,13 +39,11 @@ public fun DataFrame.parse(options: ParserOptions? = null, columns: Colum public fun DataFrame.parse(vararg columns: String, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.parse(vararg columns: ColumnReference, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.parse(vararg columns: KProperty, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt index be666a8448..0b1215e565 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt @@ -147,13 +147,11 @@ public inline fun AnyRow.rowPercentileOf( // endregion // region DataFrame -@Refine -@Interpretable("Percentile0") +@[Refine Interpretable("Percentile0")] public fun DataFrame.percentile(percentile: Double, skipNaN: Boolean = skipNaNDefault): DataRow = percentileFor(percentile, skipNaN, intraComparableColumns()) -@Refine -@Interpretable("Percentile1") +@[Refine Interpretable("Percentile1")] public fun ?> DataFrame.percentileFor( percentile: Double, skipNaN: Boolean = skipNaNDefault, @@ -166,16 +164,14 @@ public fun DataFrame.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.percentileFor( percentile: Double, vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.percentileFor( percentile: Double, vararg columns: KProperty, @@ -229,22 +225,19 @@ public fun DataFrame.percentileOrNull( ): Any? = Aggregators.percentileCommon?>(percentile, skipNaN).aggregateAll(this) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.percentile( percentile: Double, vararg columns: ColumnReference, ): C & Any = percentileOrNull(percentile, *columns).suggestIfNull("percentile") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.percentileOrNull( percentile: Double, vararg columns: ColumnReference, ): C? = percentileOrNull(percentile) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.percentile( percentile: Double, vararg columns: ColumnReference, @@ -253,8 +246,7 @@ public fun DataFrame.percentile( where C : Comparable?, C : Number? = percentileOrNull(percentile, *columns, skipNaN = skipNaN).suggestIfNull("percentile") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.percentileOrNull( percentile: Double, vararg columns: ColumnReference, @@ -263,22 +255,19 @@ public fun DataFrame.percentileOrNull( where C : Comparable?, C : Number? = percentileOrNull(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.percentile( percentile: Double, vararg columns: KProperty, ): C & Any = percentileOrNull(percentile, *columns).suggestIfNull("percentile") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> DataFrame.percentileOrNull( percentile: Double, vararg columns: KProperty, ): C? = percentileOrNull(percentile) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.percentile( percentile: Double, vararg columns: KProperty, @@ -287,8 +276,7 @@ public fun DataFrame.percentile( where C : Comparable?, C : Number? = percentileOrNull(percentile, *columns, skipNaN = skipNaN).suggestIfNull("percentile") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.percentileOrNull( percentile: Double, vararg columns: KProperty, @@ -341,16 +329,14 @@ public fun DataFrame.percentileBy( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileByOrNull(percentile, column, skipNaN).suggestIfNull("percentileBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.percentileBy( percentile: Double, column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileByOrNull(percentile, column, skipNaN).suggestIfNull("percentileBy") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.percentileBy( percentile: Double, column: KProperty, @@ -369,16 +355,14 @@ public fun DataFrame.percentileByOrNull( skipNaN: Boolean = skipNaNDefault, ): DataRow? = percentileByOrNull(percentile, column.toColumnOf?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.percentileByOrNull( percentile: Double, column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.percentileCommon(percentile, skipNaN).aggregateByOrNull(this, column) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> DataFrame.percentileByOrNull( percentile: Double, column: KProperty, @@ -388,13 +372,11 @@ public inline fun ?> DataFrame.percentileB // endregion // region GroupBy -@Refine -@Interpretable("GroupByPercentile1") +@[Refine Interpretable("GroupByPercentile1")] public fun Grouped.percentile(percentile: Double, skipNaN: Boolean = skipNaNDefault): DataFrame = percentileFor(percentile, skipNaN, intraComparableColumns()) -@Refine -@Interpretable("GroupByPercentile0") +@[Refine Interpretable("GroupByPercentile0")] public fun ?> Grouped.percentileFor( percentile: Double, skipNaN: Boolean = skipNaNDefault, @@ -404,24 +386,21 @@ public fun ?> Grouped.percentileFor( public fun Grouped.percentileFor(percentile: Double, vararg columns: String): DataFrame = percentileFor(percentile) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.percentileFor( percentile: Double, vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.percentileFor( percentile: Double, vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByPercentile2") +@[Refine Interpretable("GroupByPercentile2")] public fun ?> Grouped.percentile( percentile: Double, name: String? = null, @@ -436,8 +415,7 @@ public fun Grouped.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, name, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.percentile( percentile: Double, vararg columns: ColumnReference, @@ -445,8 +423,7 @@ public fun ?> Grouped.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, name, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Grouped.percentile( percentile: Double, vararg columns: KProperty, @@ -454,8 +431,7 @@ public fun ?> Grouped.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, name, skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByPercentileOf") +@[Refine Interpretable("GroupByPercentileOf")] public inline fun ?> Grouped.percentileOf( percentile: Double, name: String? = null, @@ -470,8 +446,7 @@ public inline fun ?> GroupBy.percent crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.percentileBy( percentile: Double, column: ColumnReference, @@ -484,8 +459,7 @@ public fun GroupBy.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedGroupBy = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> GroupBy.percentileBy( percentile: Double, column: KProperty, @@ -516,8 +490,7 @@ public fun Pivot.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.percentileFor( percentile: Double, vararg columns: ColumnReference, @@ -525,8 +498,7 @@ public fun ?> Pivot.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.percentileFor( percentile: Double, vararg columns: KProperty, @@ -546,16 +518,14 @@ public fun Pivot.percentile( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentile(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.percentile( percentile: Double, vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = percentile(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> Pivot.percentile( percentile: Double, vararg columns: KProperty, @@ -574,8 +544,7 @@ public inline fun ?> Pivot.percentileBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.percentileBy( percentile: Double, column: ColumnReference, @@ -588,8 +557,7 @@ public fun Pivot.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedPivot = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> Pivot.percentileBy( percentile: Double, column: KProperty, @@ -619,8 +587,7 @@ public fun PivotGroupBy.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, separate, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.percentileFor( percentile: Double, vararg columns: ColumnReference, @@ -628,8 +595,7 @@ public fun ?> PivotGroupBy.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.percentileFor( percentile: Double, vararg columns: KProperty, @@ -649,16 +615,14 @@ public fun PivotGroupBy.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.percentile( percentile: Double, vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ?> PivotGroupBy.percentile( percentile: Double, vararg columns: KProperty, @@ -677,8 +641,7 @@ public inline fun ?> PivotGroupBy.percenti crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.percentileBy( percentile: Double, column: ColumnReference, @@ -691,8 +654,7 @@ public fun PivotGroupBy.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedPivotGroupBy = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun ?> PivotGroupBy.percentileBy( percentile: Double, column: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt index 4b6721f2cb..c8be16267f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt @@ -326,25 +326,20 @@ public interface PivotDsl : ColumnsSelectionDsl { @ExcludeFromSources private interface ThenDocs - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.then(other: ColumnsResolver): ColumnSet = toColumnAccessor() then other - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnsResolver.then(other: KProperty): ColumnSet = this then other.toColumnAccessor() - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.then(other: KProperty): ColumnSet = toColumnAccessor() then other.toColumnAccessor() - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.then(other: String): ColumnSet = toColumnAccessor() then other.toColumnOf() - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun String.then(other: KProperty): ColumnSet = toColumnOf() then other.toColumnAccessor() } @@ -430,13 +425,11 @@ public fun DataFrame.pivot(inward: Boolean? = null, columns: PivotColumns public fun DataFrame.pivot(vararg columns: String, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.pivot(vararg columns: AnyColumnReference, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.pivot(vararg columns: KProperty<*>, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } @@ -526,13 +519,11 @@ public fun DataFrame.pivotMatches(inward: Boolean = true, columns: PivotC public fun DataFrame.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.pivotMatches(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -618,13 +609,11 @@ public fun DataFrame.pivotCounts(inward: Boolean = true, columns: PivotCo public fun DataFrame.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.pivotCounts(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } @@ -665,8 +654,7 @@ private interface CommonPivotForGroupByDocs public fun GroupBy<*, G>.pivot(inward: Boolean = true, columns: PivotColumnsSelector): PivotGroupBy = PivotGroupByImpl(this, columns, inward) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy<*, G>.pivot(vararg columns: AnyColumnReference, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -681,8 +669,7 @@ public fun GroupBy<*, G>.pivot(vararg columns: AnyColumnReference, inward: B public fun GroupBy<*, G>.pivot(vararg columns: String, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy<*, G>.pivot(vararg columns: KProperty<*>, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -754,13 +741,11 @@ public fun GroupBy<*, G>.pivotMatches(inward: Boolean = true, columns: Pivot public fun GroupBy<*, G>.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy<*, G>.pivotMatches(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy<*, G>.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -830,13 +815,11 @@ public fun GroupBy<*, G>.pivotCounts(inward: Boolean = true, columns: PivotC public fun GroupBy<*, G>.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy<*, G>.pivotCounts(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy<*, G>.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } @@ -949,15 +932,13 @@ public fun AggregateGroupedDsl.pivot( public fun AggregateGroupedDsl.pivot(vararg columns: String, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AggregateGroupedDsl.pivot( vararg columns: AnyColumnReference, inward: Boolean = true, ): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AggregateGroupedDsl.pivot(vararg columns: KProperty<*>, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -1035,15 +1016,13 @@ public fun AggregateGroupedDsl.pivotMatches( public fun AggregateGroupedDsl.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AggregateGroupedDsl.pivotMatches( vararg columns: AnyColumnReference, inward: Boolean = true, ): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AggregateGroupedDsl.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -1121,15 +1100,13 @@ public fun AggregateGroupedDsl.pivotCounts( public fun AggregateGroupedDsl.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AggregateGroupedDsl.pivotCounts( vararg columns: AnyColumnReference, inward: Boolean = true, ): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AggregateGroupedDsl.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt index 35e8bbebd0..f62f64293c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt @@ -50,8 +50,7 @@ private interface CommonRemoveDocs * @include [SelectingColumns.Dsl.WithExample] {@include [SetRemoveOperationArg]} * @param [columns] The [Columns Selector][ColumnsSelector] used to remove the columns of this [DataFrame]. */ -@Refine -@Interpretable("Remove0") +@[Refine Interpretable("Remove0")] public fun DataFrame.remove(columns: ColumnsSelector): DataFrame = removeImpl(allowMissingColumns = true, columns = columns).df @@ -67,8 +66,7 @@ public fun DataFrame.remove(vararg columns: String): DataFrame = remov * @include [SelectingColumns.ColumnAccessors.WithExample] {@include [SetRemoveOperationArg]} * @param [columns] The [Column Accessors][ColumnReference] used to remove the columns of this [DataFrame]. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.remove(vararg columns: AnyColumnReference): DataFrame = remove { columns.toColumnSet() } /** @@ -76,8 +74,7 @@ public fun DataFrame.remove(vararg columns: AnyColumnReference): DataFram * @include [SelectingColumns.KProperties.WithExample] {@include [SetRemoveOperationArg]} * @param [columns] The [KProperties][KProperty] used to remove the columns of this [DataFrame]. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.remove(vararg columns: KProperty<*>): DataFrame = remove { columns.toColumnSet() } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt index 48e44fd628..e614ef5e61 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt @@ -109,8 +109,7 @@ private interface CommonRenameDocs * and the new column name (`second`). * @return A new [DataFrame] with the renamed columns. */ -@Refine -@Interpretable("RenameMapping") +@[Refine Interpretable("RenameMapping")] public fun DataFrame.rename(vararg mappings: Pair): DataFrame = rename { mappings.map { it.first.toColumnAccessor() }.toColumnSet() } .into(*mappings.map { it.second }.toTypedArray()) @@ -134,13 +133,11 @@ public fun DataFrame.rename(vararg mappings: Pair): DataF @Interpretable("Rename") public fun DataFrame.rename(columns: ColumnsSelector): RenameClause = RenameClause(this, columns) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.rename(vararg cols: ColumnReference): RenameClause = rename { cols.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.rename(vararg cols: KProperty): RenameClause = rename { cols.toColumnSet() } /** @@ -207,8 +204,7 @@ public class RenameClause(internal val df: DataFrame, internal val colu * @see [rename] * @return a [DataFrame] with column names converted to "camelCase" format. */ -@Refine -@Interpretable("RenameToCamelCase") +@[Refine Interpretable("RenameToCamelCase")] public fun DataFrame.renameToCamelCase(): DataFrame = // recursively rename all columns written with delimiters or starting with a capital to camel case rename { @@ -221,8 +217,7 @@ public fun DataFrame.renameToCamelCase(): DataFrame = it.renameToCamelCase() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun RenameClause.into(vararg newColumns: ColumnReference<*>): DataFrame = into(*newColumns.map { it.name() }.toTypedArray()) @@ -250,12 +245,10 @@ public fun RenameClause.into(vararg newColumns: ColumnReference<*>) * @param newNames The new names for the selected columns, applied in order of selecting. * @return A new [DataFrame] with the columns renamed. */ -@Refine -@Interpretable("RenameInto") +@[Refine Interpretable("RenameInto")] public fun RenameClause.into(vararg newNames: String): DataFrame = renameImpl(newNames) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun RenameClause.into(vararg newNames: KProperty<*>): DataFrame = into(*newNames.map { it.name }.toTypedArray()) @@ -282,8 +275,7 @@ public fun RenameClause.into(vararg newNames: KProperty<*>): DataFr * and returns the new column name. * @return A new [DataFrame] with the columns renamed. */ -@Refine -@Interpretable("RenameIntoLambda") +@[Refine Interpretable("RenameIntoLambda")] public fun RenameClause.into(transform: (ColumnWithPath) -> String): DataFrame = renameImpl(transform) @@ -317,8 +309,7 @@ public fun RenameClause.into(transform: (ColumnWithPath) -> Stri * * @return a [DataFrame] with column names converted to "camelCase" format. */ -@Refine -@Interpretable("RenameToCamelCaseClause") +@[Refine Interpretable("RenameToCamelCaseClause")] public fun RenameClause.toCamelCase(): DataFrame = into { it.renameToCamelCase().name() } // endregion @@ -543,8 +534,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnReference.named(nameOf: ColumnReference<*>): ColumnReference = named(nameOf.name) /** @@ -553,8 +543,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnReference.named(nameOf: KProperty<*>): ColumnReference = named(nameOf.columnName) /** @@ -571,8 +560,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun String.named(nameOf: ColumnReference<*>): ColumnReference<*> = toColumnAccessor().named(nameOf.name) @@ -582,8 +570,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun String.named(nameOf: KProperty<*>): ColumnReference<*> = toColumnAccessor().named(nameOf.columnName) @@ -593,8 +580,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.StringParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.named(newName: String): ColumnReference = toColumnAccessor().named(newName) /** @@ -603,8 +589,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.named(nameOf: ColumnReference<*>): ColumnReference = toColumnAccessor().named(nameOf.name) @@ -614,8 +599,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.named(nameOf: KProperty<*>): ColumnReference = toColumnAccessor().named(nameOf.columnName) @@ -638,8 +622,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnReference.into(nameOf: ColumnReference<*>): ColumnReference = named(nameOf) /** @@ -648,8 +631,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun ColumnReference.into(nameOf: KProperty<*>): ColumnReference = named(nameOf) /** @@ -666,8 +648,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun String.into(nameOf: ColumnReference<*>): ColumnReference<*> = named(nameOf) /** @@ -676,8 +657,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun String.into(nameOf: KProperty<*>): ColumnReference<*> = named(nameOf) /** @@ -686,8 +666,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.StringParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.into(newName: String): ColumnReference = named(newName) /** @@ -696,8 +675,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.into(nameOf: ColumnReference<*>): ColumnReference = named(nameOf) /** @@ -706,8 +684,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public infix fun KProperty.into(nameOf: KProperty<*>): ColumnReference = named(nameOf) // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt index 8b0014cf7d..cf71c95592 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt @@ -27,13 +27,11 @@ public data class Reorder( @Interpretable("Reorder") public fun DataFrame.reorder(selector: ColumnsSelector): Reorder = Reorder(this, selector, false) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.reorder(vararg columns: ColumnReference): Reorder = reorder { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.reorder(vararg columns: KProperty): Reorder = reorder { columns.toColumnSet() } public fun DataFrame.reorder(vararg columns: String): Reorder = reorder { columns.toColumnSet() } @@ -41,8 +39,7 @@ public fun DataFrame.reorder(vararg columns: String): Reorder = reo public fun > Reorder.by(expression: ColumnExpression): DataFrame = reorderImpl(false, expression) -@Refine -@Interpretable("ByName") +@[Refine Interpretable("ByName")] public fun Reorder.byName(desc: Boolean = false): DataFrame = if (desc) byDesc { it.name } else by { it.name } @@ -60,8 +57,7 @@ public fun > DataFrame.reorderColumnsBy( inFrameColumns = atAnyDepth, ).reorderImpl(desc, expression) -@Refine -@Interpretable("ReorderColumnsByName") +@[Refine Interpretable("ReorderColumnsByName")] public fun DataFrame.reorderColumnsByName(atAnyDepth: Boolean = true, desc: Boolean = false): DataFrame = reorderColumnsBy(atAnyDepth, desc) { name() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt index f55e825481..40ae5ae36f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt @@ -21,13 +21,11 @@ public fun DataFrame.replace(columns: ColumnsSelector): ReplaceC public fun DataFrame.replace(vararg columns: String): ReplaceClause = replace { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.replace(vararg columns: ColumnReference): ReplaceClause = replace { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.replace(vararg columns: KProperty): ReplaceClause = replace { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt index 882b7bb74d..05096b2934 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt @@ -63,8 +63,7 @@ private interface CommonSelectDocs * @include [SelectingColumns.Dsl.WithExample] {@include [SetSelectOperationArg]} * @param [columns] The [Columns Selector][ColumnsSelector] used to select the columns of this [DataFrame]. */ -@Refine -@Interpretable("Select0") +@[Refine Interpretable("Select0")] public fun DataFrame.select(columns: ColumnsSelector): DataFrame = get(columns).toDataFrame().cast() /** @@ -72,8 +71,7 @@ public fun DataFrame.select(columns: ColumnsSelector): DataFrame * @include [SelectingColumns.KProperties.WithExample] {@include [SetSelectOperationArg]} * @param [columns] The [KProperties][KProperty] used to select the columns of this [DataFrame]. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.select(vararg columns: KProperty<*>): DataFrame = select { columns.toColumnSet() } /** @@ -81,8 +79,7 @@ public fun DataFrame.select(vararg columns: KProperty<*>): DataFrame = * @include [SelectingColumns.ColumnNames.WithExample] {@include [SetSelectOperationArg]} * @param [columns] The [Column Names][String] used to select the columns of this [DataFrame]. */ -@Refine -@Interpretable("SelectString") +@[Refine Interpretable("SelectString")] public fun DataFrame.select(vararg columns: String): DataFrame = select { columns.toColumnSet() } /** @@ -90,8 +87,7 @@ public fun DataFrame.select(vararg columns: String): DataFrame = selec * @include [SelectingColumns.ColumnAccessors.WithExample] {@include [SetSelectOperationArg]} * @param [columns] The [Column Accessors][ColumnReference] used to select the columns of this [DataFrame]. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.select(vararg columns: AnyColumnReference): DataFrame = select { columns.toColumnSet() } // endregion @@ -195,8 +191,7 @@ public interface SelectColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup `[`{`][KProperty.select]` colA `[and][ColumnsSelectionDsl.and]` colB `[`}`][KProperty.select]` }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.select(selector: ColumnsSelector): ColumnSet = columnGroup(this).select(selector) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt index c01a990ae1..50f4f77988 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt @@ -230,8 +230,7 @@ public interface SingleColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[singleCol][KProperty.singleCol]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.singleCol(condition: ColumnFilter<*> = { true }): SingleColumn<*> = columnGroup(this).singleCol(condition) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt index f4901dea1b..3c7fae60dc 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt @@ -35,8 +35,7 @@ public interface SortDsl : ColumnsSelectionDsl { public fun String.desc(): SingleColumn?> = invoke>().desc() - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.desc(): SingleColumn = toColumnAccessor().desc() public fun ColumnSet.nullsLast(flag: Boolean = true): ColumnSet = @@ -48,8 +47,7 @@ public interface SortDsl : ColumnsSelectionDsl { public fun String.nullsLast(flag: Boolean = true): SingleColumn?> = invoke>().nullsLast(flag) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty.nullsLast(flag: Boolean = true): SingleColumn = toColumnAccessor().nullsLast(flag) } @@ -112,14 +110,12 @@ public fun > C.sortWith(comparator: (T, T) -> Int): C = sor public fun DataFrame.sortBy(columns: SortColumnsSelector): DataFrame = sortByImpl(UnresolvedColumnsPolicy.Fail, columns) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sortBy(vararg cols: ColumnReference<*>): DataFrame = sortBy { cols.toColumnSet() } public fun DataFrame.sortBy(vararg cols: String): DataFrame = sortBy { cols.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sortBy(vararg cols: KProperty?>): DataFrame = sortBy { cols.toColumnSet() } public fun DataFrame.sortWith(comparator: Comparator>): DataFrame { @@ -135,15 +131,13 @@ public fun DataFrame.sortByDesc(columns: SortColumnsSelector): D return sortByImpl { set.desc() } } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sortByDesc(vararg columns: KProperty?>): DataFrame = sortByDesc { columns.toColumnSet() } public fun DataFrame.sortByDesc(vararg columns: String): DataFrame = sortByDesc { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sortByDesc(vararg columns: ColumnReference<*>): DataFrame = sortByDesc { columns.toColumnSet() } @@ -153,12 +147,10 @@ public fun DataFrame.sortByDesc(vararg columns: ColumnReference<*>): Data public fun GroupBy.sortBy(vararg cols: String): GroupBy = sortBy { cols.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.sortBy(vararg cols: ColumnReference<*>): GroupBy = sortBy { cols.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.sortBy(vararg cols: KProperty?>): GroupBy = sortBy { cols.toColumnSet() } @@ -166,13 +158,11 @@ public fun GroupBy.sortBy(selector: SortColumnsSelector): public fun GroupBy.sortByDesc(vararg cols: String): GroupBy = sortByDesc { cols.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.sortByDesc(vararg cols: ColumnReference<*>): GroupBy = sortByDesc { cols.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun GroupBy.sortByDesc(vararg cols: KProperty?>): GroupBy = sortByDesc { cols.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt index b78a69a74b..34a64de5fe 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt @@ -31,12 +31,10 @@ public fun DataFrame.split(columns: ColumnsSelector): Split DataFrame.split(vararg columns: String): Split = split { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.split(vararg columns: ColumnReference): Split = split { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.split(vararg columns: KProperty): Split = split { columns.toColumnSet() } public class Split( @@ -192,22 +190,19 @@ internal fun Split.toDataFrame(): DataFrame = // region into -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SplitWithTransform.into( firstName: ColumnAccessor<*>, vararg otherNames: ColumnAccessor<*>, ): DataFrame = into(listOf(firstName.name()) + otherNames.map { it.name() }) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SplitWithTransform.into( firstName: KProperty<*>, vararg otherNames: KProperty<*>, ): DataFrame = into(listOf(firstName.columnName) + otherNames.map { it.columnName }) -@Refine -@Interpretable("SplitWithTransformInto0") +@[Refine Interpretable("SplitWithTransformInto0")] public fun SplitWithTransform.into( vararg names: String, extraNamesGenerator: (ColumnWithPath.(extraColumnIndex: Int) -> String)? = null, @@ -225,8 +220,7 @@ public fun SplitWithTransform.into( } } -@Refine -@Interpretable("SplitIterableInto") +@[Refine Interpretable("SplitIterableInto")] public fun > Split.into( vararg names: String, extraNamesGenerator: ColumnNamesGenerator? = null, @@ -238,13 +232,11 @@ public fun Split>.into( extraNamesGenerator: ColumnNamesGenerator>? = null, ): DataFrame = by { it.rows() }.into(names.toList(), extraNamesGenerator) -@Refine -@Interpretable("SplitPair") +@[Refine Interpretable("SplitPair")] public fun Split>.into(firstCol: String, secondCol: String): DataFrame = by { listOf(it.first, it.second) }.into(firstCol, secondCol) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun Split>.into( firstCol: ColumnAccessor, secondCol: ColumnAccessor, @@ -266,29 +258,25 @@ public fun SplitWithTransform.inward( extraNamesGenerator: ColumnNamesGenerator? = null, ): DataFrame = copy(inward = true).into(names.toList(), extraNamesGenerator) -@Refine -@Interpretable("SplitWithTransformInward0") +@[Refine Interpretable("SplitWithTransformInward0")] public fun SplitWithTransform.inward( vararg names: String, extraNamesGenerator: ColumnNamesGenerator? = null, ): DataFrame = inward(names.toList(), extraNamesGenerator) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SplitWithTransform.inward( firstName: ColumnAccessor<*>, vararg otherNames: ColumnAccessor<*>, ): DataFrame = inward(listOf(firstName.name()) + otherNames.map { it.name() }) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SplitWithTransform.inward( firstName: KProperty<*>, vararg otherNames: KProperty<*>, ): DataFrame = inward(listOf(firstName.columnName) + otherNames.map { it.columnName }) -@Refine -@Interpretable("SplitIterableInward") +@[Refine Interpretable("SplitIterableInward")] public inline fun , reified R> Split.inward( vararg names: String, noinline extraNamesGenerator: ColumnNamesGenerator? = null, @@ -300,13 +288,11 @@ public fun , R> Split.inward( extraNamesGenerator: ColumnNamesGenerator? = null, ): DataFrame = by { it.rows() }.inward(names.toList(), extraNamesGenerator) -@Refine -@Interpretable("SplitPairInward") +@[Refine Interpretable("SplitPairInward")] public fun Split>.inward(firstCol: String, secondCol: String): DataFrame = by { listOf(it.first, it.second) }.inward(firstCol, secondCol) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun Split>.inward( firstCol: ColumnAccessor, secondCol: ColumnAccessor, @@ -323,8 +309,7 @@ public fun Split.inward( // region intoColumns -@Refine -@Interpretable("SplitAnyFrameIntoColumns") +@[Refine Interpretable("SplitAnyFrameIntoColumns")] public fun Split.intoColumns(): DataFrame = df.convert(columns).with { when { @@ -339,15 +324,13 @@ public fun Split.intoColumns(): DataFrame = // region intoRows @JvmName("intoRowsTC") -@Refine -@Interpretable("SplitIntoRows") +@[Refine Interpretable("SplitIntoRows")] public inline fun , reified R> Split.intoRows(dropEmpty: Boolean = true): DataFrame = by { it } .intoRows(dropEmpty) @JvmName("intoRowsFrame") -@Refine -@Interpretable("SplitAnyFrameRows") +@[Refine Interpretable("SplitAnyFrameRows")] public fun Split.intoRows(dropEmpty: Boolean = true): DataFrame = by { it.rows() }.intoRows(dropEmpty) @@ -356,8 +339,7 @@ internal inline fun Convert.splitInplace( crossinline transform: DataRow.(C) -> Iterable, ) = withRowCellImpl(getListType(type), Infer.None) { if (it == null) emptyList() else transform(it).asList() } -@Refine -@Interpretable("SplitWithTransformIntoRows") +@[Refine Interpretable("SplitWithTransformIntoRows")] public fun SplitWithTransform.intoRows(dropEmpty: Boolean = true): DataFrame { val paths = df.getColumnPaths(columns).toColumnSet() return df.convert { paths as ColumnSet }.splitInplace(tartypeOf, transform).explode(dropEmpty) { paths } @@ -368,12 +350,10 @@ public fun SplitWithTransform.intoRows(dropEmpty: Boolean = t // region inplace @JvmName("inplaceTC") -@Refine -@Interpretable("SplitInplace") +@[Refine Interpretable("SplitInplace")] public inline fun , reified R> Split.inplace(): DataFrame = by { it }.inplace() -@Refine -@Interpretable("SplitWithTransformInplace") +@[Refine Interpretable("SplitWithTransformInplace")] public fun SplitWithTransform.inplace(): DataFrame = df.convert(columns).splitInplace(tartypeOf, transform) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt index 7c0e431ff9..4cb8f6ca4f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt @@ -65,13 +65,11 @@ public inline fun AnyRow.rowStdOf( // endregion // region DataFrame -@Refine -@Interpretable("Std0") +@[Refine Interpretable("Std0")] public fun DataFrame.std(skipNaN: Boolean = skipNaNDefault, ddof: Int = ddofDefault): DataRow = stdFor(skipNaN, ddof, primitiveOrMixedNumberColumns()) -@Refine -@Interpretable("Std1") +@[Refine Interpretable("Std1")] public fun DataFrame.stdFor( skipNaN: Boolean = skipNaNDefault, ddof: Int = ddofDefault, @@ -90,8 +88,7 @@ public fun DataFrame.stdFor( ddof: Int = ddofDefault, ): DataRow = stdFor(skipNaN, ddof) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.stdFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -104,14 +101,12 @@ public fun DataFrame.std( columns: ColumnsSelector, ): Double = Aggregators.std(skipNaN, ddof).aggregateAll(this, columns) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.std(vararg columns: ColumnReference): Double = std { columns.toColumnSet() } public fun DataFrame.std(vararg columns: String): Double = std { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.std(vararg columns: KProperty): Double = std { columns.toColumnSet() } public inline fun DataFrame.stdOf( @@ -123,13 +118,11 @@ public inline fun DataFrame.stdOf( // endregion // region GroupBy -@Refine -@Interpretable("GroupByStd1") +@[Refine Interpretable("GroupByStd1")] public fun Grouped.std(skipNaN: Boolean = skipNaNDefault, ddof: Int = ddofDefault): DataFrame = stdFor(skipNaN, ddof, primitiveOrMixedNumberColumns()) -@Refine -@Interpretable("GroupByStd0") +@[Refine Interpretable("GroupByStd0")] public fun Grouped.stdFor( skipNaN: Boolean = skipNaNDefault, ddof: Int = ddofDefault, @@ -142,24 +135,21 @@ public fun Grouped.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.stdFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ddof: Int = ddofDefault, ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.stdFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, ddof: Int = ddofDefault, ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByStd2") +@[Refine Interpretable("GroupByStd2")] public fun Grouped.std( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -167,8 +157,7 @@ public fun Grouped.std( columns: ColumnsSelector, ): DataFrame = Aggregators.std(skipNaN, ddof).aggregateAll(this, name, columns) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.std( vararg columns: ColumnReference, name: String? = null, @@ -183,8 +172,7 @@ public fun Grouped.std( ddof: Int = ddofDefault, ): DataFrame = std(name, skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.std( vararg columns: KProperty, name: String? = null, @@ -192,8 +180,7 @@ public fun Grouped.std( ddof: Int = ddofDefault, ): DataFrame = std(name, skipNaN, ddof) { columns.toColumnSet() } -@Refine -@Interpretable("GroupByStdOf") +@[Refine Interpretable("GroupByStdOf")] public inline fun Grouped.stdOf( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -232,8 +219,7 @@ public fun Pivot.stdFor( ddof: Int = ddofDefault, ): DataRow = stdFor(separate, skipNaN, ddof) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.stdFor( vararg columns: KProperty, separate: Boolean = false, @@ -259,8 +245,7 @@ public fun Pivot.std( ddof: Int = ddofDefault, ): DataRow = std(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.std( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -297,8 +282,7 @@ public fun PivotGroupBy.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(separate, skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.stdFor( vararg columns: ColumnReference, separate: Boolean = false, @@ -306,8 +290,7 @@ public fun PivotGroupBy.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(separate, skipNaN, ddof) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.stdFor( vararg columns: KProperty, separate: Boolean = false, @@ -321,8 +304,7 @@ public fun PivotGroupBy.std( columns: ColumnsSelector, ): DataFrame = Aggregators.std(skipNaN, ddof).aggregateAll(this, columns) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.std( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -335,8 +317,7 @@ public fun PivotGroupBy.std( ddof: Int = ddofDefault, ): DataFrame = std(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.std( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt index 93d042e6d9..6136f93999 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt @@ -126,13 +126,11 @@ public fun AnyRow.rowSumOf(type: KType, skipNaN: Boolean = skipNaNDefault): Numb // endregion // region DataFrame -@Refine -@Interpretable("Sum0") +@[Refine Interpretable("Sum0")] public fun DataFrame.sum(skipNaN: Boolean = skipNaNDefault): DataRow = sumFor(skipNaN, primitiveOrMixedNumberColumns()) -@Refine -@Interpretable("Sum1") +@[Refine Interpretable("Sum1")] public fun DataFrame.sumFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -141,15 +139,13 @@ public fun DataFrame.sumFor( public fun DataFrame.sumFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = sumFor(skipNaN) { columns.toColumnsSetOf() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sumFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sumFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, @@ -174,18 +170,15 @@ public fun DataFrame.sum( ): C & Any = Aggregators.sum(skipNaN).aggregateAll(this, columns) as (C & Any) @JvmName("sumShort") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sum(vararg columns: ColumnReference): Int = sum { columns.toColumnSet() } @JvmName("sumByte") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sum(vararg columns: ColumnReference): Int = sum { columns.toColumnSet() } @JvmName("sumNumber") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sum( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, @@ -195,18 +188,15 @@ public fun DataFrame.sum(vararg columns: String, skipNaN: Boolean = skipN sum(skipNaN) { columns.toColumnsSetOf() } @JvmName("sumShort") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sum(vararg columns: KProperty): Int = sum { columns.toColumnSet() } @JvmName("sumByte") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sum(vararg columns: KProperty): Int = sum { columns.toColumnSet() } @JvmName("sumNumber") -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.sum( skipNaN: Boolean = skipNaNDefault, vararg columns: KProperty, @@ -233,13 +223,11 @@ public inline fun DataFrame.sumOf( // endregion // region GroupBy -@Refine -@Interpretable("GroupBySum1") +@[Refine Interpretable("GroupBySum1")] public fun Grouped.sum(skipNaN: Boolean = skipNaNDefault): DataFrame = sumFor(skipNaN, primitiveOrMixedNumberColumns()) -@Refine -@Interpretable("GroupBySum0") +@[Refine Interpretable("GroupBySum0")] public fun Grouped.sumFor( skipNaN: Boolean = skipNaNDefault, columns: ColumnsForAggregateSelector, @@ -248,22 +236,19 @@ public fun Grouped.sumFor( public fun Grouped.sumFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = sumFor(skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.sumFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.sumFor( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupBySum2") +@[Refine Interpretable("GroupBySum2")] public fun Grouped.sum( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -276,24 +261,21 @@ public fun Grouped.sum( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(name, skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.sum( vararg columns: ColumnReference, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(name, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.sum( vararg columns: KProperty, name: String? = null, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(name, skipNaN) { columns.toColumnSet() } -@Refine -@Interpretable("GroupBySumOf") +@[Refine Interpretable("GroupBySumOf")] public inline fun Grouped.sumOf( resultName: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -319,16 +301,14 @@ public fun Pivot.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(separate, skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.sumFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.sumFor( vararg columns: KProperty, separate: Boolean = false, @@ -343,15 +323,13 @@ public fun Pivot.sum( public fun Pivot.sum(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = sum(skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.sum( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = sum(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.sum(vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault): DataRow = sum(skipNaN) { columns.toColumnSet() } @@ -379,16 +357,14 @@ public fun PivotGroupBy.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(separate, skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.sumFor( vararg columns: ColumnReference, separate: Boolean = false, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.sumFor( vararg columns: KProperty, separate: Boolean = false, @@ -403,15 +379,13 @@ public fun PivotGroupBy.sum( public fun PivotGroupBy.sum(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = sum(skipNaN) { columns.toNumberColumns() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.sum( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(skipNaN) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.sum( vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt index 1a95b426b3..fe3afd07b5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt @@ -158,8 +158,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeCols][KProperty.takeCols]`(1) }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.takeCols(n: Int): ColumnSet<*> = columnGroup(this).takeCols(n) /** @@ -229,8 +228,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeLastCols][KProperty.takeLastCols]`(1) }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.takeLastCols(n: Int): ColumnSet<*> = columnGroup(this).takeLastCols(n) /** @@ -300,8 +298,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeColsWhile][KProperty.takeColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.takeColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).takeColsWhile(predicate) @@ -373,8 +370,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeLastColsWhile][KProperty.takeLastColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.takeLastColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).takeLastColsWhile(predicate) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt index ae36d5cd5c..4ce9720ba5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt @@ -24,20 +24,17 @@ import kotlin.reflect.typeOf // region read DataFrame from objects -@Refine -@Interpretable("toDataFrameDefault") +@[Refine Interpretable("toDataFrameDefault")] public inline fun Iterable.toDataFrame(): DataFrame = toDataFrame { properties() } -@Refine -@Interpretable("toDataFrameDsl") +@[Refine Interpretable("toDataFrameDsl")] public inline fun Iterable.toDataFrame(noinline body: CreateDataFrameDsl.() -> Unit): DataFrame = createDataFrameImpl(typeOf(), body) -@Refine -@Interpretable("toDataFrame") +@[Refine Interpretable("toDataFrame")] public inline fun Iterable.toDataFrame(vararg props: KProperty<*>, maxDepth: Int = 0): DataFrame = toDataFrame { properties(roots = props, maxDepth = maxDepth) @@ -199,8 +196,7 @@ public abstract class CreateDataFrameDsl : TraversePropertiesDsl { @Interpretable("ToDataFrameFrom0") public inline infix fun String.from(noinline expression: (T) -> R): Unit = add(this, expression) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline infix fun KProperty.from(noinline expression: (T) -> R): Unit = add(columnName, expression) @@ -208,8 +204,7 @@ public abstract class CreateDataFrameDsl : TraversePropertiesDsl { public inline infix fun String.from(inferType: InferType): Unit = add(DataColumn.createByInference(this, source.map { inferType.expression(it) })) - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline infix fun KProperty.from(inferType: InferType): Unit = add(DataColumn.createByInference(columnName, source.map { inferType.expression(it) })) @@ -221,8 +216,7 @@ public abstract class CreateDataFrameDsl : TraversePropertiesDsl { public abstract operator fun String.invoke(builder: CreateDataFrameDsl.() -> Unit) } -@Refine -@Interpretable("ToDataFrameColumn") +@[Refine Interpretable("ToDataFrameColumn")] public inline fun Iterable.toDataFrame(columnName: String): DataFrame<*> = toDataFrame { columnName from { it } @@ -273,8 +267,7 @@ public fun Map>.toDataFrame(): AnyFrame = * @return A [DataFrame] containing the data from the nested list structure. * Returns an empty [DataFrame] if the input is empty or invalid. */ -@Refine -@Interpretable("ValuesListsToDataFrame") +@[Refine Interpretable("ValuesListsToDataFrame")] public fun List>.toDataFrame(header: List?, containsColumns: Boolean = false): AnyFrame = when { containsColumns -> { diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt index 682423fc77..5dde6f58aa 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt @@ -233,8 +233,7 @@ public inline fun Iterable.toValueColumn(name: String = ""): Valu public inline fun Iterable.toValueColumn(column: ColumnAccessor): ValueColumn = toValueColumn(column.name()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun Iterable.toValueColumn(column: KProperty): ValueColumn = toValueColumn(column.columnName) @@ -338,8 +337,7 @@ public inline fun Iterable<*>.toColumnOf(name: String = ""): DataCol public inline fun Iterable.toColumn(ref: ColumnReference): DataColumn = DataColumn.createByType(ref.name(), asList()).forceResolve() -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public inline fun Iterable.toColumn(property: KProperty): DataColumn = DataColumn.createByType(property.columnName, asList()).forceResolve() @@ -373,22 +371,19 @@ public fun DataFrame.asGroupBy(groupedColumnName: String): GroupBy return asGroupBy { groups.cast() } } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.asGroupBy(groupedColumn: ColumnReference>): GroupBy { val groups = getFrameColumn(groupedColumn.name()).castFrameColumn() return asGroupBy { groups } } -@Refine -@Interpretable("AsGroupByDefault") +@[Refine Interpretable("AsGroupByDefault")] public fun DataFrame.asGroupBy(): GroupBy { val groupCol = columns().single { it.isFrameColumn() }.asAnyFrameColumn().castFrameColumn() return asGroupBy { groupCol } } -@Refine -@Interpretable("AsGroupBy") +@[Refine Interpretable("AsGroupBy")] public fun DataFrame.asGroupBy(selector: ColumnSelector>): GroupBy { val column = getColumn(selector).asFrameColumn() return GroupByImpl(this.move { column }.toEnd(), column) { none() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt index 49e984fd8e..51880a245b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt @@ -18,8 +18,7 @@ import kotlin.reflect.typeOf public inline fun DataColumn.unfold(vararg roots: KCallable<*>, maxDepth: Int = 0): AnyCol = unfoldImpl(typeOf()) { properties(roots = roots, maxDepth) } -@Refine -@Interpretable("DataFrameUnfold") +@[Refine Interpretable("DataFrameUnfold")] public fun DataFrame.unfold( vararg roots: KCallable<*>, maxDepth: Int = 0, @@ -28,10 +27,8 @@ public fun DataFrame.unfold( public fun DataFrame.unfold(vararg columns: String): DataFrame = unfold { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.unfold(vararg columns: AnyColumnReference): DataFrame = unfold { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.unfold(vararg columns: KProperty<*>): DataFrame = unfold { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt index ce94a93ca7..617fa848fd 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt @@ -57,8 +57,7 @@ private interface CommonUngroupDocs * ``` * @param [columns\] The [Columns Selector][ColumnsSelector] used to select the column groups of this [DataFrame] to ungroup. */ -@Refine -@Interpretable("Ungroup0") +@[Refine Interpretable("Ungroup0")] public fun DataFrame.ungroup(columns: ColumnsSelector): DataFrame = move { columns.toColumnSet().colsInGroups() } .into { it.path.removeAt(it.path.size - 2).toPath() } @@ -70,13 +69,11 @@ public fun DataFrame.ungroup(columns: ColumnsSelector): DataFram */ public fun DataFrame.ungroup(vararg columns: String): DataFrame = ungroup { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.ungroup(vararg columns: AnyColumnReference): DataFrame = ungroup { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.ungroup(vararg columns: KProperty<*>): DataFrame = ungroup { columns.toColumnSet() } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt index ecbced9ec9..1ae8889377 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt @@ -184,8 +184,7 @@ public fun DataFrame.update(vararg columns: String): Update = up * @include [UpdateWithNote] * @include [Update.KPropertiesParam] */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.update(vararg columns: KProperty): Update = update { columns.toColumnSet() } /** @@ -194,8 +193,7 @@ public fun DataFrame.update(vararg columns: KProperty): Update DataFrame.update(vararg columns: ColumnReference): Update = update { columns.toColumnSet() } @@ -271,8 +269,7 @@ public fun Update.at(rowRange: IntRange): Update = where { in * - {@include [SeeAlsoUpdatePerCol]} * @param [expression] The {@include [ExpressionsGivenRowAndColumn.RowColumnExpressionLink]} to provide a new value for every selected cell giving its row and column. */ -@Refine -@Interpretable("UpdatePerRowCol") +@[Refine Interpretable("UpdatePerRowCol")] public inline fun Update.perRowCol(crossinline expression: RowColumnExpression): DataFrame = updateImpl { row, column, _ -> expression(row, column) } @@ -298,8 +295,7 @@ public typealias UpdateExpression = AddDataRow.(C) -> R * - {@include [SeeAlsoUpdatePerRowCol]} * @param [expression] The {@include [ExpressionsGivenRow.RowValueExpressionLink]} to update the rows with. */ -@Refine -@Interpretable("UpdateWith0") +@[Refine Interpretable("UpdateWith0")] public inline fun Update.with(crossinline expression: UpdateExpression): DataFrame = updateImpl { row, _, value -> expression(row, value) @@ -362,8 +358,7 @@ private interface CommonUpdatePerColMapDoc * @param [values] The [Map]<[String], Value> to provide a new value for every selected cell. * For each selected column, there must be a value in the map with the same name. */ -@Refine -@Interpretable("UpdatePerColMap") +@[Refine Interpretable("UpdatePerColMap")] public fun Update.perCol(values: Map): DataFrame = updateWithValuePerColumnImpl { values[it.name()] ?: throw IllegalArgumentException("Update value for column ${it.name()} is not defined") @@ -381,8 +376,7 @@ public fun Update.perCol(values: Map): DataFrame = * * @param [values] The [DataRow] to provide a new value for every selected cell. */ -@Refine -@Interpretable("UpdatePerColRow") +@[Refine Interpretable("UpdatePerColRow")] public fun Update.perCol(values: AnyRow): DataFrame = perCol(values.toMap() as Map) /** @@ -392,8 +386,7 @@ public fun Update.perCol(values: AnyRow): DataFrame = perCol(val * * @param [valueSelector] The {@include [ExpressionsGivenColumn.ColumnExpressionLink]} to provide a new value for every selected cell giving its column. */ -@Refine -@Interpretable("UpdatePerCol") +@[Refine Interpretable("UpdatePerCol")] public fun Update.perCol(valueSelector: ColumnExpression): DataFrame = updateWithValuePerColumnImpl(valueSelector) @@ -447,8 +440,7 @@ public fun Update.notNull(): Update = where { it != null } a * {@comment No brackets around `expression` because this doc is copied to [Update.notNull]} * @param expression Optional {@include [ExpressionsGivenRow.RowExpressionLink]} to update the rows with. */ -@Refine -@Interpretable("UpdateNotNull") +@[Refine Interpretable("UpdateNotNull")] public fun Update.notNull(expression: UpdateExpression): DataFrame = notNull().with(expression) @@ -464,8 +456,7 @@ public fun Update.notNull(expression: UpdateExpression): * @include [Update.ColumnAccessorsParam] * @param [expression] The {@include [ExpressionsGivenRow.RowValueExpressionLink]} to update the rows with. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.update( firstCol: ColumnReference, vararg cols: ColumnReference, @@ -484,8 +475,7 @@ public fun DataFrame.update( * @include [Update.KPropertiesParam] * @param [expression] The {@include [ExpressionsGivenRow.RowValueExpressionLink]} to update the rows with. */ -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.update( firstCol: KProperty, vararg cols: KProperty, @@ -533,8 +523,7 @@ private interface CommonSpecificWithDoc { * {@set [CommonSpecificWithDoc.FIRST] `null`} * {@set [CommonSpecificWithDoc.SECOND] [withNull][withNull]`()} */ -@Refine -@Interpretable("UpdateWithNull") +@[Refine Interpretable("UpdateWithNull")] public fun Update.withNull(): DataFrame = with { null } /** @@ -543,6 +532,5 @@ public fun Update.withNull(): DataFrame = with { null } * {@set [CommonSpecificWithDoc.FIRST] `0`} * {@set [CommonSpecificWithDoc.SECOND] [withZero][withZero]`()} */ -@Refine -@Interpretable("UpdateWithZero") +@[Refine Interpretable("UpdateWithZero")] public fun Update.withZero(): DataFrame = updateWithValuePerColumnImpl { 0 as C } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt index 42f44b9617..c534bccce5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt @@ -161,8 +161,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColReferenceDocs] {@set [CommonValueColDocs.RECEIVER]} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun valueCol(valueCol: ColumnAccessor): ColumnAccessor = valueCol.ensureIsValueColumn() /** @@ -193,8 +192,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColReferenceDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(valueCol: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(valueCol.path()).ensureIsValueColumn() @@ -281,16 +279,14 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(name: String): ColumnAccessor<*> = valueCol(name) /** * @include [ValueColNameDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonValueColDocs.ValueColumnTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(name: String): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(name).ensureIsValueColumn() @@ -385,16 +381,14 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(path: ColumnPath): ColumnAccessor<*> = valueCol(path) /** * @include [ValueColPathDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonValueColDocs.ValueColumnTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(path: ColumnPath): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(path).ensureIsValueColumn() @@ -428,47 +422,41 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER]} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun valueCol(property: KProperty): SingleColumn = valueColumn(property).ensureIsValueColumn() /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun SingleColumn>.valueCol(property: KProperty): SingleColumn = valueCol(property.name) /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun AnyColumnGroupAccessor.valueCol(property: KProperty): ColumnAccessor = this.ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun String.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ColumnPath.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -541,16 +529,14 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(index: Int): SingleColumn<*> = valueCol(index) /** * @include [ValueColIndexDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonValueColDocs.ValueColumnTypeParam] */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCol(index: Int): SingleColumn = columnGroup(this).valueCol(index) /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt index 137cab3659..edc30535b5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt @@ -160,8 +160,7 @@ public interface ValueColsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[valueCols][KProperty.valueCols]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.valueCols(filter: Predicate> = { true }): ColumnSet<*> = columnGroup(this).valueCols(filter) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt index 5a49c050a0..e5b63d4237 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt @@ -56,8 +56,7 @@ public fun DataColumn.valueCounts( // region DataFrame -@Refine -@Interpretable("ValueCounts") +@[Refine Interpretable("ValueCounts")] public fun DataFrame.valueCounts( sort: Boolean = true, ascending: Boolean = false, @@ -86,8 +85,7 @@ public fun DataFrame.valueCounts( resultColumn: String = defaultCountColumnName, ): DataFrame = valueCounts(sort, ascending, dropNA, resultColumn) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.valueCounts( vararg columns: AnyColumnReference, sort: Boolean = true, @@ -96,8 +94,7 @@ public fun DataFrame.valueCounts( resultColumn: String = defaultCountColumnName, ): DataFrame = valueCounts(sort, ascending, dropNA, resultColumn) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun DataFrame.valueCounts( vararg columns: KProperty<*>, sort: Boolean = true, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt index 85c6bebfb6..975a7812f5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt @@ -30,8 +30,7 @@ public fun DataFrame.valuesNotNull(byRow: Boolean = false): Sequence // region GroupBy -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Grouped.values( vararg columns: AnyColumnReference, dropNA: Boolean = false, @@ -59,15 +58,13 @@ public fun Grouped.values(dropNA: Boolean = false, distinct: Boolean = fa public fun ReducedGroupBy.values(): DataFrame = values(groupBy.remainingColumnsSelector()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedGroupBy.values(vararg columns: AnyColumnReference): DataFrame = values { columns.toColumnSet() } public fun ReducedGroupBy.values(vararg columns: String): DataFrame = values { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedGroupBy.values(vararg columns: KProperty<*>): DataFrame = values { columns.toColumnSet() } @@ -85,8 +82,7 @@ public fun Pivot.values( columns: ColumnsForAggregateSelector, ): DataRow = delegate { values(dropNA, distinct, separate, columns) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.values( vararg columns: AnyColumnReference, dropNA: Boolean = false, @@ -101,8 +97,7 @@ public fun Pivot.values( separate: Boolean = false, ): DataRow = values(dropNA, distinct, separate) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun Pivot.values( vararg columns: KProperty<*>, dropNA: Boolean = false, @@ -126,16 +121,14 @@ public fun Pivot.values( public fun ReducedPivot.values(separate: Boolean = false): DataRow = pivot.delegate { reduce(reducer).values(separate = separate) } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedPivot.values(vararg columns: AnyColumnReference, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } public fun ReducedPivot.values(vararg columns: String, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedPivot.values(vararg columns: KProperty<*>, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } @@ -154,8 +147,7 @@ public fun PivotGroupBy.values( separate: Boolean = false, ): DataFrame = values(dropNA, distinct, separate, remainingColumnsSelector()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.values( vararg columns: AnyColumnReference, dropNA: Boolean = false, @@ -170,8 +162,7 @@ public fun PivotGroupBy.values( separate: Boolean = false, ): DataFrame = values(dropNA, distinct, separate) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun PivotGroupBy.values( vararg columns: KProperty<*>, dropNA: Boolean = false, @@ -193,8 +184,7 @@ public fun PivotGroupBy.values( public fun ReducedPivotGroupBy.values(separate: Boolean = false): DataFrame = values(separate, pivot.remainingColumnsSelector()) -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedPivotGroupBy.values( vararg columns: AnyColumnReference, separate: Boolean = false, @@ -203,8 +193,7 @@ public fun ReducedPivotGroupBy.values( public fun ReducedPivotGroupBy.values(vararg columns: String, separate: Boolean = false): DataFrame = values(separate) { columns.toColumnSet() } -@Deprecated(DEPRECATED_ACCESS_API) -@AccessApiOverload +@[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun ReducedPivotGroupBy.values(vararg columns: KProperty<*>, separate: Boolean = false): DataFrame = values(separate) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt index 1b203687c3..a0dc3bc0eb 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt @@ -131,8 +131,7 @@ public interface WithoutNullsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[colsWithoutNulls][KProperty.colsWithoutNulls]`() }` */ - @Deprecated(DEPRECATED_ACCESS_API) - @AccessApiOverload + @[Deprecated(DEPRECATED_ACCESS_API) AccessApiOverload] public fun KProperty<*>.colsWithoutNulls(): ColumnSet = columnGroup(this).colsWithoutNulls() /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt index 21d932046c..3153d93bec 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt @@ -8,15 +8,13 @@ import org.jetbrains.kotlinx.dataframe.impl.api.xsImpl // region DataFrame -@Refine -@Interpretable("DataFrameXs") +@[Refine Interpretable("DataFrameXs")] public fun DataFrame.xs(vararg keyValues: Any?): DataFrame = xs(*keyValues) { colsAtAnyDepth().filter { !it.isColumnGroup() }.take(keyValues.size) } -@Refine -@Interpretable("DataFrameXs") +@[Refine Interpretable("DataFrameXs")] public fun DataFrame.xs(vararg keyValues: C, keyColumns: ColumnsSelector): DataFrame = xsImpl(keyColumns, false, *keyValues) @@ -24,15 +22,13 @@ public fun DataFrame.xs(vararg keyValues: C, keyColumns: ColumnsSelect // region GroupBy -@Refine -@Interpretable("GroupByXs") +@[Refine Interpretable("GroupByXs")] public fun GroupBy.xs(vararg keyValues: Any?): GroupBy = xs(*keyValues) { colsAtAnyDepth().filter { !it.isColumnGroup() }.take(keyValues.size) } -@Refine -@Interpretable("GroupByXs") +@[Refine Interpretable("GroupByXs")] public fun GroupBy.xs(vararg keyValues: C, keyColumns: ColumnsSelector): GroupBy = xsImpl(*keyValues, keyColumns = keyColumns)