Move plotter model out of visualization

controls-constructor/src/commonMain/kotlin/space/kscience/controls/constructor/models/MaterialPoint.kt

@@ -26,17 +26,23 @@ public class MaterialPoint(
     private var currentForce = force.value
 
     private val movement = onTimer(
+        DefaultTimer.REALTIME,
         reads = setOf(velocity, position),
         writes = setOf(velocity, position)
     ) { prev, next ->
         val dtSeconds = (next - prev).toDouble(DurationUnit.SECONDS)
 
         // compute new value based on velocity and acceleration from the previous step
-        position.value += (velocity.value * dtSeconds).cast(Meters) +
+        val deltaR = (velocity.value * dtSeconds).cast(Meters) +
                 (currentForce / mass.value * dtSeconds.pow(2) / 2).cast(Meters)
+        position.value += deltaR
 
         // compute new velocity based on acceleration on the previous step
-        velocity.value += (currentForce / mass.value * dtSeconds).cast(MetersPerSecond)
+        val deltaV = (currentForce / mass.value * dtSeconds).cast(MetersPerSecond)
+        //TODO apply energy correction
+        //val work = deltaR.length.value * currentForce.length.value
+        velocity.value += deltaV
+
         currentForce = force.value
     }
 }

controls-constructor/src/commonMain/kotlin/space/kscience/controls/constructor/units/coordinates.kt

@@ -1,5 +1,8 @@
 package space.kscience.controls.constructor.units
 
+import kotlin.math.pow
+import kotlin.math.sqrt
+
 public data class XY<U : UnitsOfMeasurement>(val x: NumericalValue<U>, val y: NumericalValue<U>)
 
 public fun <U : UnitsOfMeasurement> XY(x: Number, y: Number): XY<U> = XY(NumericalValue(x), NumericalValue((y)))
@@ -18,6 +21,11 @@ public data class XYZ<U : UnitsOfMeasurement>(
     val z: NumericalValue<U>,
 )
 
+public val <U : UnitsOfMeasurement> XYZ<U>.length: NumericalValue<U>
+    get() = NumericalValue(
+        sqrt(x.value.pow(2) + y.value.pow(2) + z.value.pow(2))
+    )
+
 public fun <U : UnitsOfMeasurement> XYZ(x: Number, y: Number, z: Number): XYZ<U> =
     XYZ(NumericalValue(x), NumericalValue((y)), NumericalValue(z))
 

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

@@ -16,8 +16,6 @@ import space.kscience.controls.constructor.models.MaterialPoint
 import space.kscience.controls.constructor.units.*
 import space.kscience.dataforge.context.Context
 import java.awt.Dimension
-import kotlin.math.pow
-import kotlin.math.sqrt
 
 
 private class Spring(
@@ -33,7 +31,7 @@ private class Spring(
      */
     val tension: DeviceState<XYZ<Newtons>> = combineState(begin, end) { begin: XYZ<Meters>, end: XYZ<Meters> ->
         val delta = end - begin
-        val l = sqrt(delta.x.value.pow(2) + delta.y.value.pow(2) + delta.z.value.pow(2))
+        val l = delta.length.value
         ((delta / l) * k * (l - l0.value)).cast(Newtons)
     }
 }
@@ -87,7 +85,7 @@ private class BodyOnSprings(
 }
 
 fun main() = application {
-    val initialState = XYZ<Meters>(0.01, 0.1, 0)
+    val initialState = XYZ<Meters>(0, 0.4, 0)
 
     Window(title = "Ball on springs", onCloseRequest = ::exitApplication) {
         window.minimumSize = Dimension(400, 400)

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

@@ -11,11 +11,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
+import space.kscience.controls.constructor.*
-import space.kscience.controls.constructor.DeviceConstructor
-import space.kscience.controls.constructor.MutableDeviceState
-import space.kscience.controls.constructor.device
 import space.kscience.controls.constructor.devices.StepDrive
 import space.kscience.controls.constructor.devices.angle
 import space.kscience.controls.constructor.models.ScrewDrive
@@ -28,7 +27,7 @@ import java.awt.Dimension
 import kotlin.random.Random
 
 
-class Plotter(
+private class Plotter(
     context: Context,
     xDrive: StepDrive,
     yDrive: StepDrive,
@@ -42,16 +41,16 @@ class Plotter(
         yDrive.target.value = y.toLong()
     }
 
-//    val position = combineState(xDrive.position, yDrive.position) { x, y ->
+    val ticks = combineState(xDrive.position, yDrive.position) { x, y ->
-//        space.kscience.controls.constructor.models.XY(x, y)
+        x to y
-//    }
+    }
 
     //TODO add calibration
 
     // TODO add draw as action
 }
 
-suspend fun Plotter.modernArt(xRange: IntRange, yRange: IntRange) {
+private suspend fun Plotter.modernArt(xRange: IntRange, yRange: IntRange) {
     while (isActive) {
         val randomX = Random.nextInt(xRange.first, xRange.last)
         val randomY = Random.nextInt(yRange.first, yRange.last)
@@ -62,7 +61,7 @@ suspend fun Plotter.modernArt(xRange: IntRange, yRange: IntRange) {
     }
 }
 
-suspend fun Plotter.square(xRange: IntRange, yRange: IntRange) {
+private suspend fun Plotter.square(xRange: IntRange, yRange: IntRange) {
     while (isActive) {
         moveToXY(xRange.first, yRange.first)
         delay(1000)
@@ -94,12 +93,33 @@ private data class PlotterPoint(
     val color: Color = Color.Black,
 )
 
+private class PlotterModel(
+    context: Context,
+    val callback: (PlotterPoint) -> Unit,
+) : ModelConstructor(context) {
+
+    private val xDrive = StepDrive(context, ticksPerSecond)
+    private val xTransmission = ScrewDrive(context, NumericalValue(0.01))
+    val x = xTransmission.degreesToMeters(xDrive.angle(step)).coerceIn(xRange)
+
+    private val yDrive = StepDrive(context, ticksPerSecond)
+    private val yTransmission = ScrewDrive(context, NumericalValue(0.01))
+    val y = yTransmission.degreesToMeters(yDrive.angle(step)).coerceIn(yRange)
+
+    val xy: DeviceState<XY<Meters>> = combineState(x, y) { x, y -> XY(x, y) }
+
+    val plotter = Plotter(context, xDrive, yDrive) { color ->
+        println("Point X: ${x.value.value}, Y: ${y.value.value}, color: $color")
+        callback(PlotterPoint(x.value, y.value, color))
+    }
+}
+
 suspend fun main() = application {
     Window(title = "Pid regulator simulator", onCloseRequest = ::exitApplication) {
         window.minimumSize = Dimension(400, 400)
 
         val points = remember { mutableStateListOf<PlotterPoint>() }
-        var position by remember { mutableStateOf(PlotterPoint(NumericalValue(0), NumericalValue(0))) }
+        var position by remember { mutableStateOf(XY<Meters>(0, 0)) }
 
         LaunchedEffect(Unit) {
             val context = Context {
@@ -109,42 +129,23 @@ suspend fun main() = application {
 
             /* Here goes the device definition block */
 
-
+            val plotterModel = PlotterModel(context) { plotterPoint ->
-            val xDrive = StepDrive(context, ticksPerSecond)
+                points.add(plotterPoint)
-            val xTransmission = ScrewDrive(context, NumericalValue(0.01))
-            val x = xTransmission.degreesToMeters(xDrive.angle(step)).coerceIn(xRange)
-
-            val yDrive = StepDrive(context, ticksPerSecond)
-            val yTransmission = ScrewDrive(context, NumericalValue(0.01))
-            val y = yTransmission.degreesToMeters(yDrive.angle(step)).coerceIn(yRange)
-
-            val plotter = Plotter(context, xDrive, yDrive) { color ->
-                println("Point X: ${x.value.value}, Y: ${y.value.value}, color: $color")
-                points.add(PlotterPoint(x.value, y.value, color))
             }
 
-
             /* Start visualization program */
 
-            launch {
+            plotterModel.xy.valueFlow.onEach {
-                x.valueFlow.collect {
+                position = it
-                    position = position.copy(x = it)
+            }.launchIn(this)
-                }
-            }
-
-            launch {
-                y.valueFlow.collect {
-                    position = position.copy(y = it)
-                }
-            }
 
             /* run program */
 
-            launch {
+
             val range = -1000..1000
 //                plotter.modernArt(range, range)
-                plotter.square(range, range)
+            plotterModel.plotter.square(range, range)
-            }
+
         }