Merge remote-tracking branch 'spc/dev' into dev

# Conflicts:
#	demo/constructor/src/jvmMain/kotlin/EnrichmentFacility.kt

Author: altavir

demo/constructor/src/jvmMain/kotlin/EnrichmentFacility.kt

@@ -42,14 +42,18 @@ import kotlin.time.Instant
 
 
 private class EnrichmentFacility(
-    context: Context
+    context: Context,
 ) : ContinuousFlowModel(context) {
 
     val mixture = MixtureAlgebra(Kilograms, Mixture.ofFractions(component1 to 1.0, component2 to 1.0))
 
-    val production = MutableDeviceState(
-        mixture.one
-    )
+    val productionValue = MutableDeviceState(Numeric<Kilograms>(1.0))
+
+    val production = productionValue.map {
+        with(mixture) {
+            one * it.value
+        }
+    }
 
     val producer = producer(mixture, production)
 
@@ -58,7 +62,7 @@ private class EnrichmentFacility(
     }
 
     private class MyMixtureSeparationRule(
-        val fractions: Map<MixtureComponent, Map<String, Double>>
+        val fractions: Map<MixtureComponent, Map<String, Double>>,
     ) : SeparationRule<Kilograms, Mixture<Kilograms, Numeric<Kilograms>>> {
         override val productionKeys: Collection<String> = fractions.flatMap { it.value.keys }.distinct()
 
@@ -87,27 +91,28 @@ private class EnrichmentFacility(
         separationRule = MyMixtureSeparationRule(
             mapOf(
                 component1 to mapOf(
-                    productionKey to 0.75,
+                    productionKey to 0.7,
                     feedbackKey to 0.2,
-                    discardKey to 0.05
+                    discardKey to 0.1
                 ),
                 component2 to mapOf(
                     productionKey to 0.1,
-                    feedbackKey to 0.1,
-                    discardKey to 0.8
+                    feedbackKey to 0.2,
+                    discardKey to 0.7
                 )
             )
         )
     ).apply {
         connectProducer(mixer)
-        mixer.connectProducer(feedbackKey, asProducer(feedbackKey).delayed(this, 400.milliseconds))
+        mixer.connectProducer(feedbackKey, asProducer(feedbackKey).delayed(this, 200.milliseconds))
     }
 
     val discard = consumer(mixture, DeviceState(Numeric(2.0))).apply {
         connectProducer(separator.asProducer(discardKey))
     }
 
-    val consumer = consumer(mixture, DeviceState(Numeric(2.0))).apply {
+    val consumption = MutableDeviceState<Numeric<Kilograms>>(Numeric(2.0))
+    val consumer = consumer(mixture, consumption).apply {
         connectProducer(separator.asProducer(productionKey))
     }
 
@@ -154,14 +159,22 @@ fun main() {
                                 Text("${it[EnrichmentFacility.component1]?.value}, ${it[EnrichmentFacility.component2]?.value}")
                             }
 
-                            model.displayState("Feedback", model.mixer.individualConsumation[EnrichmentFacility.feedbackKey]!!) {
+                            model.displayState(
+                                "Feedback",
+                                model.mixer.individualConsumation[EnrichmentFacility.feedbackKey]!!
+                            ) {
                                 Text("${it[EnrichmentFacility.component1]?.value}, ${it[EnrichmentFacility.component2]?.value}")
                             }
 
                             model.displayState("Mixer production", model.mixer.production) {
                                 Text("${it[EnrichmentFacility.component1]?.value}, ${it[EnrichmentFacility.component2]?.value}")
                             }
+
+                            model.slider("Production", model.productionValue, 0f..4f)
+                            model.slider("Consumption", model.consumption, 0f..4f)
+
                         }
+
                     }
                     second(400.dp) {
                         ChartLayout {

demo/constructor/src/jvmMain/kotlin/visualUtils.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
+import androidx.compose.material3.Slider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -13,11 +14,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.Job
 import space.kscience.controls.compose.asComposeState
-import space.kscience.controls.constructor.DeviceState
-import space.kscience.controls.constructor.StateContainer
-import space.kscience.controls.constructor.clock
+import space.kscience.controls.constructor.*
 import space.kscience.controls.constructor.units.Amount
-import space.kscience.controls.constructor.useValue
+import space.kscience.controls.constructor.units.Numeric
+import space.kscience.controls.constructor.units.UnitsOfMeasurement
 import kotlin.time.Duration.Companion.seconds
 
 internal fun StateContainer.debugState(name: String, state: DeviceState<Amount<*>>): Job =
@@ -44,4 +44,27 @@ fun <T> StateContainer.displayState(
 
         content(value)
     }
+}
+
+@Composable
+fun <U: UnitsOfMeasurement> StateContainer.slider(
+    name: String,
+    state: MutableDeviceState<Numeric<U>>,
+    valueRange: ClosedFloatingPointRange<Float>
+) {
+
+    val value: Numeric<U> by state.asComposeState(coroutineContext, 0.1.seconds)
+
+    Row(
+        modifier = Modifier.fillMaxWidth().border(2.dp, Color.Blue).padding(4.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text("$name: ")
+        Slider(
+            value = value.value.toFloat(),
+            onValueChange = { state.value = Numeric(it) },
+            valueRange = valueRange,
+            modifier = Modifier.weight(1f)
+        )
+    }
 }