first todo with piechart completed

halotukozak · Jan 17, 2024 · dce4541 · dce4541
1 parent 33913c4
commit dce4541
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/src/main/kotlin/backend/Simulation.kt b/src/main/kotlin/backend/Simulation.kt
@@ -77,7 +77,7 @@ class Simulation(
   fun slower() = _dayDuration.updateAndGet { it + 100 }
 
 
-  override fun close() {
+  override fun close() { ///todo make it working
     launchMainImmediate { simulationJob.cancelAndJoin() }
   }
 

diff --git a/src/main/kotlin/backend/statistics/StatisticsService.kt b/src/main/kotlin/backend/statistics/StatisticsService.kt
@@ -5,8 +5,10 @@ import backend.map.Vector
 import backend.model.Animal
 import backend.model.Gen
 import backend.model.Genome
+import javafx.scene.chart.PieChart
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import metrics.Day
 import metrics.collector.Collector
 import metrics.collector.MutableCollector
@@ -90,6 +92,14 @@ class StatisticsService(simulationConfig: Config) {
   private val _genCollector by lazy { MutableCollector<Gen>(range) }
   val genCollector: Collector<Gen> by lazy { _genCollector }
 
+  val presentGens by lazy {
+    genCollector.map {
+      it.toList().lastOrNull()?.second?.sortedBy { it.first }?.map { (gen, count) ->
+        PieChart.Data(gen.name, count.toDouble())
+      }
+    }
+  }
+
   val isGenomeCollectorEnabled = simulationConfig.genomes
   private val _genomeCollector by lazy { MutableCollector<Genome>(range) }
   val genomeCollector: Collector<Genome> by lazy { _genomeCollector }

diff --git a/src/main/kotlin/frontend/statistics/StatisticsView.kt b/src/main/kotlin/frontend/statistics/StatisticsView.kt
@@ -8,7 +8,6 @@ import frontend.components.View
 import frontend.components.card
 import frontend.components.fontIcon
 import javafx.scene.chart.NumberAxis
-import javafx.scene.chart.PieChart
 import javafx.scene.chart.XYChart
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
@@ -116,10 +115,8 @@ class StatisticsView(
             vbox {
               piechart("Present") {
                 animated = false
-                genCollector.onUpdate {
-                  data.setAll(it.toList().lastOrNull()?.second?.sortedBy { it.first }?.map { (gen, count) ->
-                    PieChart.Data(gen.name, count.toDouble()) //todo to view model
-                  })
+                presentGens.onUpdate {
+                  data.setAll(it)
                 }
               }
               linechart("Gens", NumberAxis(), NumberAxis()) {

diff --git a/src/main/kotlin/shared/FlowUtils.kt b/src/main/kotlin/shared/FlowUtils.kt
@@ -10,11 +10,11 @@ inline fun <T, U, V> Flow<Pair<T, U>>.mapValues(crossinline f: suspend (T, U) ->
 inline fun <T, U, V> Flow<Pair<T, U>>.mapValues(crossinline f: suspend (U) -> V): Flow<Pair<T, V>> =
   map { (t, u) -> t to f(u) }
 
-fun <K, V> Flow<Pair<K, V>>.group(): Flow<Pair<K, List<V>>> = flow {//todo idk if it works
+fun <K, V> Flow<Pair<K, V>>.group(): Flow<Pair<K, List<V>>> = flow {
   val storage = mutableMapOf<K, MutableList<V>>()
   collect { t -> storage.getOrPut(t.first) { mutableListOf() } += t.second }
   storage.forEach { (k, ts) -> emit(k to ts) }
 }
 
 val Flow<Boolean>.not
-  get() = map { !it }
+  get() = map { !it }