From 704ff16cc41eb2200f05e2c928e6448c7822af6c Mon Sep 17 00:00:00 2001 From: chernov Date: Fri, 23 Jan 2026 10:19:57 +0300 Subject: [PATCH] fix: some trap models instantiation --- .../kotlin/ru/inr/mass/scripts/trap-common.kt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/numass-workspace/src/main/kotlin/ru/inr/mass/scripts/trap-common.kt b/numass-workspace/src/main/kotlin/ru/inr/mass/scripts/trap-common.kt index cddfeb6..caf8b7c 100644 --- a/numass-workspace/src/main/kotlin/ru/inr/mass/scripts/trap-common.kt +++ b/numass-workspace/src/main/kotlin/ru/inr/mass/scripts/trap-common.kt @@ -23,13 +23,26 @@ enum class TrapModel(val description: String) : ITrap { NOZIK -> nozikValue(delta) FINE_2DAY -> fine2DayInterpolator.value(ei, delta) FINE_5DAY -> fine5DayInterpolator.value(ei, delta) - LEGACY_2024_07_12 -> TrapInterpolator_24_07_12().value(ei, delta) - LEGACY_FULL -> TrapInterpolatorFull().value(ei, delta) - LEGACY_DEFAULT -> TrapInterpolator().value(ei, delta) + LEGACY_2024_07_12 -> trapInterpolator_24_07_12.value(ei, delta) + LEGACY_FULL -> trapInterpolatorFull.value(ei, delta) + LEGACY_DEFAULT -> trapInterpolator.value(ei, delta) } } private companion object { + + private val trapInterpolator_24_07_12: TrapInterpolator_24_07_12 by lazy { + TrapInterpolator_24_07_12() + } + + private val trapInterpolatorFull: TrapInterpolatorFull by lazy { + TrapInterpolatorFull() + } + + private val trapInterpolator: TrapInterpolator by lazy { + TrapInterpolator() + } + // ===================================================================== // 1. Аналитическая модель Нозика // =====================================================================