From a7e4c8ddc61df2eb5bd9e9d3f649444ae170d528 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 18 Jan 2018 10:47:53 +0300 Subject: [PATCH] Minor fixes to kodex --- build.gradle | 10 +++++++--- .../groovy/inr/numass/scripts/temp/FSSEffect.groovy | 2 +- .../main/java/inr/numass/models/LossCalculator.java | 4 ++-- .../main/java/inr/numass/models/ModularSpectrum.java | 8 ++++---- .../java/inr/numass/models/NamedSpectrumCaching.java | 4 ++-- .../src/main/kotlin/inr/numass/viewer/AmplitudeView.kt | 2 +- .../src/main/kotlin/inr/numass/viewer/SpectrumView.kt | 2 +- .../kotlin/inr/numass/viewer/test/ComponentTest.kt | 2 +- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index e138c1a7..7c674b63 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,9 @@ +buildscript { + ext.kotlin_version = "1.2.20" +} + plugins { - id "org.jetbrains.kotlin.jvm" version "1.2.10" apply false + id "org.jetbrains.kotlin.jvm" version "1.2.20" apply false } allprojects{ @@ -21,8 +25,8 @@ allprojects{ } dependencies{ - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.10" - compile "org.jetbrains.kotlin:kotlin-reflect:1.2.10" + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" testCompile group: 'junit', name: 'junit', version: '4.+' } diff --git a/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy b/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy index bb1f6d1e..327e6eae 100644 --- a/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy +++ b/numass-main/src/main/groovy/inr/numass/scripts/temp/FSSEffect.groovy @@ -22,7 +22,7 @@ new GrindShell(ctx).eval { def beta = new NumassBeta(); - def params = MetaMorph.morph(ParamSet, + def params = MetaMorph.morphNode(ParamSet, Grind.buildMeta("params") { E0(value: 18575, err: 0.1) mnu2(value: 0, err: 0.01) diff --git a/numass-main/src/main/java/inr/numass/models/LossCalculator.java b/numass-main/src/main/java/inr/numass/models/LossCalculator.java index 88e01c3d..174b2061 100644 --- a/numass-main/src/main/java/inr/numass/models/LossCalculator.java +++ b/numass-main/src/main/java/inr/numass/models/LossCalculator.java @@ -57,7 +57,7 @@ public class LossCalculator { private LossCalculator() { cache.put(1, getSingleScatterFunction()); -// cache.put(2, getDoubleScatterFunction()); +// immutable.put(2, getDoubleScatterFunction()); } public static UnivariateFunction getSingleScatterFunction() { @@ -253,7 +253,7 @@ public class LossCalculator { synchronized (this) { cache.computeIfAbsent(order, (i) -> { LoggerFactory.getLogger(getClass()) - .debug("Scatter cache of order {} not found. Updating", i); + .debug("Scatter immutable of order {} not found. Updating", i); return getNextLoss(getMargin(i), getLoss(i - 1)); }); return cache.get(order); diff --git a/numass-main/src/main/java/inr/numass/models/ModularSpectrum.java b/numass-main/src/main/java/inr/numass/models/ModularSpectrum.java index 4ea1e4a1..5122c514 100644 --- a/numass-main/src/main/java/inr/numass/models/ModularSpectrum.java +++ b/numass-main/src/main/java/inr/numass/models/ModularSpectrum.java @@ -88,7 +88,7 @@ public class ModularSpectrum extends AbstractParametricFunction { public void setTrappingFunction(BivariateFunction trappingFunction) { this.trappingFunction = trappingFunction; - LoggerFactory.getLogger(getClass()).info("Recalculating modular spectrum cache"); + LoggerFactory.getLogger(getClass()).info("Recalculating modular spectrum immutable"); setupCache(); } @@ -128,7 +128,7 @@ public class ModularSpectrum extends AbstractParametricFunction { private void updateScatterCache(int order) { if (order >= cacheList.size()) { LoggerFactory.getLogger(getClass()) - .debug("Updating scatter cache up to order of '{}'", order); + .debug("Updating scatter immutable up to order of '{}'", order); // здесь можно сэкономить вызовы, начиная с cacheList.size(), но надо это? for (int i = 1; i < order + 1; i++) { BivariateFunction loss = calculator.getLossFunction(i); @@ -194,7 +194,7 @@ public class ModularSpectrum extends AbstractParametricFunction { } /** - * Set the boundaries and recalculate cache + * Set the boundaries and recalculate immutable * * @param cacheMin * @param cacheMax @@ -218,7 +218,7 @@ public class ModularSpectrum extends AbstractParametricFunction { } /** - * Suppress warnings about cache recalculation + * Suppress warnings about immutable recalculation * @param suppress */ public void setSuppressWarnings(boolean suppress) { diff --git a/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java b/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java index 6c235a18..00a354c0 100644 --- a/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java +++ b/numass-main/src/main/java/inr/numass/models/NamedSpectrumCaching.java @@ -87,7 +87,7 @@ public class NamedSpectrumCaching extends AbstractParametricFunction { } catch (TransformationNotAvailable ex) { if (!suppressWarnings) { LoggerFactory.getLogger(getClass()) - .debug("Transformation of cache is not available. Updating cache."); + .debug("Transformation of immutable is not available. Updating immutable."); } el = new CacheElement(set, parName); spectrumDerivCache.put(parName, el); @@ -169,7 +169,7 @@ public class NamedSpectrumCaching extends AbstractParametricFunction { } catch (TransformationNotAvailable ex) { if (!suppressWarnings) { LoggerFactory.getLogger(getClass()) - .debug("Transformation of cache is not available. Updating cache."); + .debug("Transformation of immutable is not available. Updating immutable."); } spectrumCache = new CacheElement(set); return spectrumCache.value(x); diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt index 25c051ea..f168ff12 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/AmplitudeView.kt @@ -104,7 +104,7 @@ class AmplitudeView( } /** - * Calculate or get spectrum from the cache + * Calculate or get spectrum from the immutable */ private suspend fun getSpectrum(point: NumassPoint): Table { return cache.computeIfAbsent(point) { analyzer.getAmplitudeSpectrum(point, Meta.empty()) } diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt index 2e955e25..842bd890 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/SpectrumView.kt @@ -33,7 +33,7 @@ import java.util.stream.Collectors /** * View for energy spectrum * @param analyzer - * @param cache - optional global point cache + * @param cache - optional global point immutable */ class SpectrumView( val analyzer: NumassAnalyzer = SimpleAnalyzer(), diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/test/ComponentTest.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/test/ComponentTest.kt index 8a712488..cd687710 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/test/ComponentTest.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/test/ComponentTest.kt @@ -26,7 +26,7 @@ class ViewerComponentsTest : View(title = "Numass viewer test", icon = ImageView private val cache: MutableMap = ConcurrentHashMap(); - val amp: AmplitudeView by inject(params = mapOf("cache" to cache))//= AmplitudeView(cache = cache) + val amp: AmplitudeView by inject(params = mapOf("cache" to cache))//= AmplitudeView(immutable = immutable) val sp: SpectrumView by inject(params = mapOf("cache" to cache)) val hv: HVView by inject()