diff --git a/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/Attributes.kt b/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/Attributes.kt index 56cd91b13..ad53049eb 100644 --- a/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/Attributes.kt +++ b/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/Attributes.kt @@ -83,8 +83,8 @@ public fun > Attributes.withAttribute(attribute: A): Attribu /** * Create a new [Attributes] by modifying the current one */ -public fun Attributes.modify(block: AttributesBuilder.() -> Unit): Attributes = Attributes { - putAll(this@modify) +public fun Attributes.modified(block: AttributesBuilder.() -> Unit): Attributes = Attributes { + putAll(this@modified) block() } diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt index 960e07b5b..1afb59e5d 100644 --- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt +++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/MultivariateIntegrand.kt @@ -26,7 +26,7 @@ public fun MultivariateIntegrand.withAttribute( public fun MultivariateIntegrand.withAttributes( block: AttributesBuilder>.() -> Unit, -): MultivariateIntegrand = withAttributes(attributes.modify(block)) +): MultivariateIntegrand = withAttributes(attributes.modified(block)) public inline fun MultivariateIntegrand( attributeBuilder: AttributesBuilder>.() -> Unit, diff --git a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt index 9d718e633..dbe507233 100644 --- a/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt +++ b/kmath-functions/src/commonMain/kotlin/space/kscience/kmath/integration/UnivariateIntegrand.kt @@ -27,7 +27,7 @@ public fun UnivariateIntegrand.withAttribute( public fun UnivariateIntegrand.withAttributes( block: AttributesBuilder>.() -> Unit, -): UnivariateIntegrand = withAttributes(attributes.modify(block)) +): UnivariateIntegrand = withAttributes(attributes.modified(block)) public inline fun UnivariateIntegrand( attributeBuilder: AttributesBuilder>.() -> Unit, diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt index a38e9e6e8..a891b0a7f 100644 --- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt +++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/FunctionOptimization.kt @@ -65,7 +65,7 @@ public fun FunctionOptimization.withAttributes( modifier: AttributesBuilder>.() -> Unit, ): FunctionOptimization = FunctionOptimization( expression, - attributes.modify(modifier), + attributes.modified(modifier), ) /** diff --git a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt index a954b769a..44b7d17bd 100644 --- a/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt +++ b/kmath-optimization/src/commonMain/kotlin/space/kscience/kmath/optimization/XYFit.kt @@ -108,7 +108,7 @@ public fun XYOptimization( public fun XYFit.withAttributes( modifier: AttributesBuilder.() -> Unit, -): XYFit = XYFit(data, model, attributes.modify(modifier), pointToCurveDistance, pointWeight, xSymbol) +): XYFit = XYFit(data, model, attributes.modified(modifier), pointToCurveDistance, pointWeight, xSymbol) public suspend fun XYColumnarData.fitWith( optimizer: Optimizer, @@ -123,7 +123,7 @@ public suspend fun XYColumnarData.fitWith( val problem = XYFit( this, modelExpression, - attributes.modify { + attributes.modified { set(OptimizationStartPoint(), startingPoint) if (!hasAny()) { set(OptimizationLog, Loggable.console)