From 726ca010bd924a227421d324b93e53fed4cff6fe Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 29 Mar 2023 16:42:30 +0200 Subject: [PATCH 1/2] it's now possible to build the project on windows again. New: errors from docProcessor --- core/build.gradle.kts | 13 ++- .../jetbrains/kotlinx/dataframe/api/Nulls.kt | 42 +++++----- .../jetbrains/kotlinx/dataframe/api/update.kt | 80 +++++++++---------- .../ExpressionsGivenDataFrame.kt | 2 +- .../documentation/ExpressionsGivenRow.kt | 2 +- .../ExpressionsGivenRowAndColumn.kt | 2 +- gradle/libs.versions.toml | 2 +- 7 files changed, 75 insertions(+), 68 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 1d1fc710b7..ede357f8a4 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -71,10 +71,12 @@ val addGeneratedSourcesToGit by tasks.creating(GitTask::class) { val kotlinMainSources = kotlin.sourceSets.main.get().kotlin.sourceDirectories val kotlinTestSources = kotlin.sourceSets.test.get().kotlin.sourceDirectories +fun pathOf(vararg parts: String) = parts.joinToString(File.separator) + // Task to generate the processed documentation val processKDocsMain by creatingProcessDocTask( sources = (kotlinMainSources + kotlinTestSources) // Include both test and main sources for cross-referencing - .filterNot { "build/generated" in it.path }, // Exclude generated sources + .filterNot { pathOf("build", "generated") in it.path }, // Exclude generated sources ) { target = file(generatedSourcesFolderName) processors = listOf( @@ -110,8 +112,13 @@ tasks.withType { kotlin.sourceSets.main { kotlin.setSrcDirs( processKDocsMain.targets - .filterNot { "src/test/kotlin" in it.path || "src/test/java" in it.path } // filter out test sources again - .plus(kotlinMainSources.filter { "build/generated" in it.path }) // Include generated sources (which were excluded above) + .filterNot { + pathOf("src", "test", "kotlin") in it.path || + pathOf("src", "test", "java") in it.path + } // filter out test sources again + .plus(kotlinMainSources.filter { + pathOf("build", "generated") in it.path + }) // Include generated sources (which were excluded above) ) } } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt index 3924673241..1ec6ffca27 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt @@ -23,9 +23,9 @@ import kotlin.reflect.KProperty */ internal interface FillNulls { - /** ## [fillNulls][org.jetbrains.kotlinx.dataframe.api.fillNulls] Operation Usage + /** ## [fillNulls][fillNulls] Operation Usage * - * [fillNulls][org.jetbrains.kotlinx.dataframe.api.fillNulls] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }` + * [fillNulls][fillNulls] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }` * * - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]` * @@ -227,9 +227,9 @@ internal inline val Float?.isNA: Boolean get() = this == null || this.isNaN() */ internal interface FillNaNs { - /** ## [fillNaNs][org.jetbrains.kotlinx.dataframe.api.fillNaNs] Operation Usage + /** ## [fillNaNs][fillNaNs] Operation Usage * - * [fillNaNs][org.jetbrains.kotlinx.dataframe.api.fillNaNs] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }` + * [fillNaNs][fillNaNs] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }` * * - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]` * @@ -401,9 +401,9 @@ public fun DataFrame.fillNaNs(columns: Iterable>): */ internal interface FillNA { - /** ## [fillNA][org.jetbrains.kotlinx.dataframe.api.fillNA] Operation Usage + /** ## [fillNA][fillNA] Operation Usage * - * [fillNA][org.jetbrains.kotlinx.dataframe.api.fillNA] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }` + * [fillNA][fillNA] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }` * * - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]` * @@ -639,7 +639,7 @@ private interface CommonDropNullsFunctionDoc * * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }` * - * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(whereAllNull = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }` + * `df.`[dropNulls][dropNulls]`(whereAllNull = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }` * @param whereAllNull `false` by default. * If `true`, rows are dropped if all selected cells are `null`. * If `false`, rows are dropped if any of the selected cells is `null`. @@ -662,7 +662,7 @@ public fun DataFrame.dropNulls(whereAllNull: Boolean = false, columns: Co * * For more information: [See `dropNulls` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnulls) * ## This Drop Nulls Overload - * This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame]. + * This overload operates on all columns in the [DataFrame]. * @param whereAllNull `false` by default. * If `true`, rows are dropped if all selected cells are `null`. * If `false`, rows are dropped if any of the selected cells is `null`. @@ -690,7 +690,7 @@ public fun DataFrame.dropNulls(whereAllNull: Boolean = false): DataFrame< * * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(Person::length, Person::age)` * - * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(Person::length, whereAllNull = true)` + * `df.`[dropNulls][dropNulls]`(Person::length, whereAllNull = true)` * @param whereAllNull `false` by default. * If `true`, rows are dropped if all selected cells are `null`. * If `false`, rows are dropped if any of the selected cells is `null`. @@ -717,7 +717,7 @@ public fun DataFrame.dropNulls(vararg columns: KProperty<*>, whereAllNull * * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`("length", "age")` * - * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`("length", whereAllNull = true)` + * `df.`[dropNulls][dropNulls]`("length", whereAllNull = true)` * @param whereAllNull `false` by default. * If `true`, rows are dropped if all selected cells are `null`. * If `false`, rows are dropped if any of the selected cells is `null`. @@ -748,7 +748,7 @@ public fun DataFrame.dropNulls(vararg columns: String, whereAllNull: Bool * * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(length, age)` * - * `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(length, whereAllNull = true)` + * `df.`[dropNulls][dropNulls]`(length, whereAllNull = true)` * @param whereAllNull `false` by default. * If `true`, rows are dropped if all selected cells are `null`. * If `false`, rows are dropped if any of the selected cells is `null`. @@ -847,7 +847,7 @@ private interface CommonDropNAFunctionDoc * * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }` * - * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(whereAllNA = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }` + * `df.`[dropNA][dropNA]`(whereAllNA = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }` * @param whereAllNA `false` by default. * If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. @@ -879,7 +879,7 @@ public fun DataFrame.dropNA(whereAllNA: Boolean = false, columns: Columns * * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(Person::length, Person::age)` * - * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(Person::length, whereAllNA = true)` + * `df.`[dropNA][dropNA]`(Person::length, whereAllNA = true)` * @param whereAllNA `false` by default. * If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. @@ -906,7 +906,7 @@ public fun DataFrame.dropNA(vararg columns: KProperty<*>, whereAllNA: Boo * * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`("length", "age")` * - * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`("length", whereAllNA = true)` + * `df.`[dropNA][dropNA]`("length", whereAllNA = true)` * @param whereAllNA `false` by default. * If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. @@ -937,7 +937,7 @@ public fun DataFrame.dropNA(vararg columns: String, whereAllNA: Boolean = * * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(length, age)` * - * `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(length, whereAllNA = true)` + * `df.`[dropNA][dropNA]`(length, whereAllNA = true)` * @param whereAllNA `false` by default. * If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. @@ -969,7 +969,7 @@ public fun DataFrame.dropNA(columns: Iterable, whereA * * For more information: [See `dropNA` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropna) * ## This Drop NA Overload - * This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame]. + * This overload operates on all columns in the [DataFrame]. * @param whereAllNA `false` by default. * If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. @@ -1055,7 +1055,7 @@ private interface CommonDropNaNsFunctionDoc * * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }` * - * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(whereAllNaN = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }` + * `df.`[dropNaNs][dropNaNs]`(whereAllNaN = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }` * @param whereAllNaN `false` by default. * If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN]. * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. @@ -1087,7 +1087,7 @@ public fun DataFrame.dropNaNs(whereAllNaN: Boolean = false, columns: Colu * * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(Person::length, Person::age)` * - * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(Person::length, whereAllNaN = true)` + * `df.`[dropNaNs][dropNaNs]`(Person::length, whereAllNaN = true)` * @param whereAllNaN `false` by default. * If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN]. * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. @@ -1114,7 +1114,7 @@ public fun DataFrame.dropNaNs(vararg columns: KProperty<*>, whereAllNaN: * * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`("length", "age")` * - * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`("length", whereAllNaN = true)` + * `df.`[dropNaNs][dropNaNs]`("length", whereAllNaN = true)` * @param whereAllNaN `false` by default. * If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN]. * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. @@ -1145,7 +1145,7 @@ public fun DataFrame.dropNaNs(vararg columns: String, whereAllNaN: Boolea * * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(length, age)` * - * `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(length, whereAllNaN = true)` + * `df.`[dropNaNs][dropNaNs]`(length, whereAllNaN = true)` * @param whereAllNaN `false` by default. * If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN]. * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. @@ -1180,7 +1180,7 @@ public fun DataFrame.dropNaNs( * * For more information: [See `dropNaNs` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnans) * ## This Drop NaNs Overload - * This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame]. + * This overload operates on all columns in the [DataFrame]. * @param whereAllNaN `false` by default. * If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN]. * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt index d53338c53d..02500521d3 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt @@ -235,9 +235,9 @@ public fun DataFrame.update(columns: Iterable>): Up * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { length }.`[where][org.jetbrains.kotlinx.dataframe.api.where]` { it > 10.0 }` + * `df.`[update][update]` { length }.`[where][where]` { it > 10.0 }` * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { `[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`(1..5) }.`[where][org.jetbrains.kotlinx.dataframe.api.where]` { `[index][org.jetbrains.kotlinx.dataframe.index]`() > 4 && city != "Paris" }` + * `df.`[update][update]` { `[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`(1..5) }.`[where][where]` { `[index][org.jetbrains.kotlinx.dataframe.index]`() > 4 && city != "Paris" }` * * * @@ -270,7 +270,7 @@ private interface CommonUpdateAtFunctionDoc { * ## At * Only update the columns at certain given [row indices][org.jetbrains.kotlinx.dataframe.api.CommonUpdateAtFunctionDoc.RowIndicesParam]: * - * Either a [Collection][Collection]<[Int][Int]>, an [IntRange][IntRange], or just `vararg` indices. + * Either a [Collection]<[Int]>, an [IntRange], or just `vararg` indices. * * For example: * @@ -280,9 +280,9 @@ private interface CommonUpdateAtFunctionDoc { * * ## This At Overload * - * Provide a [Collection][Collection]<[Int][Int]> of row indices to update. + * Provide a [Collection]<[Int]> of row indices to update. * - * @param rowIndices The indices of the rows to update. Either a [Collection][Collection]<[Int][Int]>, an [IntRange][IntRange], or just `vararg` indices. + * @param rowIndices The indices of the rows to update. Either a [Collection]<[Int]>, an [IntRange], or just `vararg` indices. */ public fun Update.at(rowIndices: Collection): Update = where { index in rowIndices } @@ -290,7 +290,7 @@ public fun Update.at(rowIndices: Collection): Update = w * ## At * Only update the columns at certain given [row indices][org.jetbrains.kotlinx.dataframe.api.CommonUpdateAtFunctionDoc.RowIndicesParam]: * - * Either a [Collection][Collection]<[Int][Int]>, an [IntRange][IntRange], or just `vararg` indices. + * Either a [Collection]<[Int]>, an [IntRange], or just `vararg` indices. * * For example: * @@ -302,7 +302,7 @@ public fun Update.at(rowIndices: Collection): Update = w * * Provide a `vararg` of [Ints][Int] of row indices to update. * - * @param rowIndices The indices of the rows to update. Either a [Collection][Collection]<[Int][Int]>, an [IntRange][IntRange], or just `vararg` indices. + * @param rowIndices The indices of the rows to update. Either a [Collection]<[Int]>, an [IntRange], or just `vararg` indices. */ public fun Update.at(vararg rowIndices: Int): Update = at(rowIndices.toSet()) @@ -310,7 +310,7 @@ public fun Update.at(vararg rowIndices: Int): Update = at(row * ## At * Only update the columns at certain given [row indices][org.jetbrains.kotlinx.dataframe.api.CommonUpdateAtFunctionDoc.RowIndicesParam]: * - * Either a [Collection][Collection]<[Int][Int]>, an [IntRange][IntRange], or just `vararg` indices. + * Either a [Collection]<[Int]>, an [IntRange], or just `vararg` indices. * * For example: * @@ -320,9 +320,9 @@ public fun Update.at(vararg rowIndices: Int): Update = at(row * * ## This At Overload * - * Provide an [IntRange][IntRange] of row indices to update. + * Provide an [IntRange] of row indices to update. * - * @param rowRange The indices of the rows to update. Either a [Collection][Collection]<[Int][Int]>, an [IntRange][IntRange], or just `vararg` indices. + * @param rowRange The indices of the rows to update. Either a [Collection]<[Int]>, an [IntRange], or just `vararg` indices. */ public fun Update.at(rowRange: IntRange): Update = where { index in rowRange } @@ -331,14 +331,14 @@ public fun Update.at(rowRange: IntRange): Update = where { in * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { age ` { row, col ->` + * `df.`[update][update]` { age ` { row, col ->` * * `row.age / col.`[mean][org.jetbrains.kotlinx.dataframe.DataColumn.mean]`(skipNA = true)` * * `}` * * - * .`[perRowCol][org.jetbrains.kotlinx.dataframe.api.perRowCol]} + * .`[perRowCol][perRowCol]} * * ## See Also * - [Update with][org.jetbrains.kotlinx.dataframe.api.Update.with] to provide a new value for every selected cell giving its row. @@ -395,8 +395,8 @@ private interface SeeAlsoWith * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { name ` { `[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { lastName } }` - * .`[asFrame][org.jetbrains.kotlinx.dataframe.api.asFrame]} + * `df.`[update][update]` { name ` { `[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { lastName } }` + * .`[asFrame][asFrame]} * @param expression The [Data Frame Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenDataFrame.DataFrameExpression] to replace the selected column group with. */ public fun Update>.asFrame(expression: DataFrameExpression>): DataFrame = @@ -443,9 +443,9 @@ private interface UpdatePerColMap * * For example: * - * `val defaults = {@includeArg [CommonUpdatePerColMapDoc][org.jetbrains.kotlinx.dataframe.api.CommonUpdatePerColMapDoc]}` + * `val defaults = {@includeArg [CommonUpdatePerColMapDoc]}` * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { name and age }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { ... }.`[perCol][org.jetbrains.kotlinx.dataframe.api.perCol]`(defaults)` + * `df.`[update][update]` { name and age }.`[where][Update.where]` { ... }.`[perCol][perCol]`(defaults)` * * @throws IllegalArgumentException if a value for a selected cell's column is not defined in [values\]. */ @@ -472,7 +472,7 @@ private interface CommonUpdatePerColMapDoc * * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { name and age }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { ... }.`[perCol][org.jetbrains.kotlinx.dataframe.api.perCol]`(defaults)` * - * @throws IllegalArgumentException if a value for a selected cell's column is not defined in [values][values]. + * @throws IllegalArgumentException if a value for a selected cell's column is not defined in [values]. * * * @param values The [Map]<[String], Value> to provide a new value for every selected cell. @@ -499,20 +499,20 @@ public fun Update.perCol(values: Map): DataFrame = up * * For example: * - * `val defaults = df.`[getRows][org.jetbrains.kotlinx.dataframe.DataFrame.getRows]`(`[listOf][listOf]`(0))` + * `val defaults = df.`[getRows][DataFrame.getRows]`(`[listOf][listOf]`(0))` * - * `.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { name ` + * `.`[update][update]` { name ` * * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { name and age }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { ... }.`[perCol][org.jetbrains.kotlinx.dataframe.api.perCol]`(defaults)` * - * @throws IllegalArgumentException if a value for a selected cell's column is not defined in [values][values]. - * .`[with][org.jetbrains.kotlinx.dataframe.api.Update.with]` { "Empty" }` + * @throws IllegalArgumentException if a value for a selected cell's column is not defined in [values]. + * .`[with][Update.with]` { "Empty" }` * - * `.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { age }.`[with][org.jetbrains.kotlinx.dataframe.api.Update.with]` { 0 }` + * `.`[update][update]` { age }.`[with][Update.with]` { 0 }` * * `.first()} * - * @param values The [DataRow][org.jetbrains.kotlinx.dataframe.DataRow] to provide a new value for every selected cell. + * @param values The [DataRow] to provide a new value for every selected cell. */ public fun Update.perCol(values: AnyRow): DataFrame = perCol(values.toMap() as Map) @@ -532,11 +532,11 @@ public fun Update.perCol(values: AnyRow): DataFrame = perCol(val * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { age ` { `[mean][org.jetbrains.kotlinx.dataframe.DataColumn.mean]`(skipNA = true) }` + * `df.`[update][update]` { age ` { `[mean][org.jetbrains.kotlinx.dataframe.DataColumn.mean]`(skipNA = true) }` * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { age ` { `[count][org.jetbrains.kotlinx.dataframe.DataColumn.count]` { it > 10 } }` + * `df.`[update][update]` { age ` { `[count][org.jetbrains.kotlinx.dataframe.DataColumn.count]` { it > 10 } }` * - * .`[perCol][org.jetbrains.kotlinx.dataframe.api.perCol]} + * .`[perCol][perCol]} * * @param valueSelector The [Column Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenColumn.ColumnExpression] to provide a new value for every selected cell giving its column. */ @@ -564,7 +564,7 @@ internal infix fun RowValueFilter?.and(other: RowValueFilter) * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Number][Number]`?>() }.`[notNull][org.jetbrains.kotlinx.dataframe.api.notNull]`()`.[perCol][org.jetbrains.kotlinx.dataframe.api.Update.perCol] `{ `[mean][org.jetbrains.kotlinx.dataframe.api.mean]`() }` * * ### Optional - * Provide an [expression][expression] to update the rows with. + * Provide an [expression] to update the rows with. * This combines [with][org.jetbrains.kotlinx.dataframe.api.Update.with] with [notNull][org.jetbrains.kotlinx.dataframe.api.notNull]. * * For example: @@ -611,7 +611,7 @@ public fun Update.notNull(expression: UpdateExpression): * ## ‎ * The columns to update need to be selected. See [Selecting Columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns] for all the selecting options. * ## This Update Overload - * ### This overload is a combination of [update][org.jetbrains.kotlinx.dataframe.api.update] and [with][org.jetbrains.kotlinx.dataframe.api.Update.with]. + * ### This overload is a combination of [update] and [with][Update.with]. * * Select columns using [column accessors][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] * ([Column Accessors API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ColumnAccessorsApi]). @@ -621,9 +621,9 @@ public fun Update.notNull(expression: UpdateExpression): * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]`("city")` ` { name.firstName + " from " + it }` + * `df.`[update][update]`("city")` ` { name.firstName + " from " + it }` * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]`("city")` ` { it.uppercase() }` + * `df.`[update][update]`("city")` ` { it.uppercase() }` * * * @@ -649,7 +649,7 @@ public fun DataFrame.update( * ## ‎ * The columns to update need to be selected. See [Selecting Columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns] for all the selecting options. * ## This Update Overload - * ### This overload is a combination of [update][org.jetbrains.kotlinx.dataframe.api.update] and [with][org.jetbrains.kotlinx.dataframe.api.Update.with]. + * ### This overload is a combination of [update] and [with][Update.with]. * * Select columns using [KProperties][KProperty] ([KProperties API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.KPropertiesApi]). * @@ -658,9 +658,9 @@ public fun DataFrame.update( * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]`("city")` ` { name.firstName + " from " + it }` + * `df.`[update][update]`("city")` ` { name.firstName + " from " + it }` * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]`("city")` ` { it.uppercase() }` + * `df.`[update][update]`("city")` ` { it.uppercase() }` * * * @@ -686,7 +686,7 @@ public fun DataFrame.update( * ## ‎ * The columns to update need to be selected. See [Selecting Columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns] for all the selecting options. * ## This Update Overload - * ### This overload is a combination of [update][org.jetbrains.kotlinx.dataframe.api.update] and [with][org.jetbrains.kotlinx.dataframe.api.Update.with]. + * ### This overload is a combination of [update] and [with][Update.with]. * * Select columns using their [column names][String] * ([String API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.StringApi]). @@ -696,9 +696,9 @@ public fun DataFrame.update( * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]`("city")` ` { name.firstName + " from " + it }` + * `df.`[update][update]`("city")` ` { name.firstName + " from " + it }` * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]`("city")` ` { it.uppercase() }` + * `df.`[update][update]`("city")` ` { it.uppercase() }` * * * @@ -733,7 +733,7 @@ private interface CommonSpecificWithDocSecondArg * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { id }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { it < 0 }.`[withNull][org.jetbrains.kotlinx.dataframe.api.withNull]`()` + * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { id }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { it < 0 }.`[withNull][withNull]`()` * * */ @@ -745,7 +745,7 @@ public fun Update.withNull(): DataFrame = with { null } * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { id }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { it < 0 }.`[withZero][org.jetbrains.kotlinx.dataframe.api.withZero]`()` + * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { id }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { it < 0 }.`[withZero][withZero]`()` * * */ @@ -753,11 +753,11 @@ public fun Update.withZero(): DataFrame = updateWithValuePerColu /** * ## With Value - * Specific version of [with][org.jetbrains.kotlinx.dataframe.api.with] that simply sets the value of each selected row to [value][org.jetbrains.kotlinx.dataframe.api.value]. + * Specific version of [with][org.jetbrains.kotlinx.dataframe.api.with] that simply sets the value of each selected row to [value]. * * For example: * - * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { id }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { it < 0 }.`[withValue][org.jetbrains.kotlinx.dataframe.api.withValue]`(-1)` + * `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]` { id }.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { it < 0 }.`[withValue][withValue]`(-1)` * * * diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt index 635e0a7208..ab2995e74b 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt @@ -22,7 +22,7 @@ internal interface ExpressionsGivenDataFrame { * * For example: * - * {@includeArg [OperationArg][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenDataFrame.OperationArg]}` { `[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { lastName } }` + * {@includeArg [OperationArg]}` { `[select][DataFrame.select]` { lastName } }` */ interface WithExample } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt index 4fcaf97090..ab7131e39c 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlinx.dataframe.RowValueExpression as DfRowValueExpressio * [RowExpression][org.jetbrains.kotlinx.dataframe.RowExpression] that provides access to * the modified/generated value of the preceding row ([AddDataRow.newValue][org.jetbrains.kotlinx.dataframe.api.AddDataRow.newValue]). * - * A [Row Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.RowExpression.WithExample] is similar to a [Row Condition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows] but that expects a [Boolean][Boolean] as result. + * A [Row Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.RowExpression.WithExample] is similar to a [Row Condition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows] but that expects a [Boolean] as result. */ internal interface ExpressionsGivenRow { diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt index 8f343c3e29..a175729c52 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt @@ -30,7 +30,7 @@ internal interface ExpressionsGivenRowAndColumn { * * `df.`operation` { row, col ->` * - * `row.age / col.`[mean][org.jetbrains.kotlinx.dataframe.DataColumn.mean]`(skipNA = true)` + * `row.age / col.`[mean][DataColumn.mean]`(skipNA = true)` * * `}` * diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c632a1380c..2d11e305ad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ junit = "4.13.2" kotestAsserions = "4.6.3" jsoup = "1.14.3" arrow = "10.0.0" -docProcessor = "0.1.1" +docProcessor = "0.1.5" simpleGit = "2.0.1" [libraries] From 69f5022012a5e3a1dc3556ede182aae565ae7ff4 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 30 Mar 2023 13:20:38 +0200 Subject: [PATCH 2/2] fixed NoSuchMethodError IncrementalCompilationOptions from doc plugin side --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d11e305ad..48b0035fbf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ junit = "4.13.2" kotestAsserions = "4.6.3" jsoup = "1.14.3" arrow = "10.0.0" -docProcessor = "0.1.5" +docProcessor = "0.1.6" simpleGit = "2.0.1" [libraries]