From 461e5a7c54722e222fa7777bb47f029ada35876f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 27 Mar 2024 08:12:39 +0300
Subject: [PATCH] Refactor names for AttributesBuilder behavior

---
 .../space/kscience/attributes/Attributes.kt     |  2 +-
 .../kscience/attributes/AttributesBuilder.kt    | 17 ++++++++++-------
 .../kmath/commons/optimization/CMOptimizer.kt   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

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 9d186acf1..56cd91b13 100644
--- a/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/Attributes.kt
+++ b/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/Attributes.kt
@@ -84,7 +84,7 @@ public fun <A : Attribute<Unit>> Attributes.withAttribute(attribute: A): Attribu
  * Create a new [Attributes] by modifying the current one
  */
 public fun <T> Attributes.modify(block: AttributesBuilder<T>.() -> Unit): Attributes = Attributes<T> {
-    from(this@modify)
+    putAll(this@modify)
     block()
 }
 
diff --git a/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/AttributesBuilder.kt b/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/AttributesBuilder.kt
index 0082ba143..033c143cc 100644
--- a/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/AttributesBuilder.kt
+++ b/attributes-kt/src/commonMain/kotlin/space/kscience/attributes/AttributesBuilder.kt
@@ -34,13 +34,18 @@ public class AttributesBuilder<out O> internal constructor(
         set(this, value)
     }
 
-    public fun from(attributes: Attributes) {
+    public infix fun <V> Attribute<V>.put(value: V?) {
+        set(this, value)
+    }
+
+    /**
+     * Put all attributes for given [attributes]
+     */
+    public fun putAll(attributes: Attributes) {
         map.putAll(attributes.content)
     }
 
-    public fun <V> SetAttribute<V>.add(
-        attrValue: V,
-    ) {
+    public infix fun <V> SetAttribute<V>.add(attrValue: V) {
         val currentSet: Set<V> = get(this) ?: emptySet()
         map[this] = currentSet + attrValue
     }
@@ -48,9 +53,7 @@ public class AttributesBuilder<out O> internal constructor(
     /**
      * Remove an element from [SetAttribute]
      */
-    public fun <V> SetAttribute<V>.remove(
-        attrValue: V,
-    ) {
+    public infix fun <V> SetAttribute<V>.remove(attrValue: V) {
         val currentSet: Set<V> = get(this) ?: emptySet()
         map[this] = currentSet - attrValue
     }
diff --git a/kmath-commons/src/jvmMain/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt b/kmath-commons/src/jvmMain/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
index 3c5f8f5e2..4030e630f 100644
--- a/kmath-commons/src/jvmMain/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
+++ b/kmath-commons/src/jvmMain/kotlin/space/kscience/kmath/commons/optimization/CMOptimizer.kt
@@ -43,7 +43,7 @@ public object CMOptimizerData : SetAttribute<SymbolIndexer.() -> OptimizationDat
  * Specify Commons-maths optimization data.
  */
 public fun AttributesBuilder<FunctionOptimization<Double>>.cmOptimizationData(data: SymbolIndexer.() -> OptimizationData) {
-    CMOptimizerData.add(data)
+    CMOptimizerData add data
 }
 
 public fun AttributesBuilder<FunctionOptimization<Double>>.simplexSteps(vararg steps: Pair<Symbol, Double>) {