From ec0734ebc1dc921813c17cf26b6f6088c86c4b90 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 14 Dec 2021 18:47:54 +0300 Subject: [PATCH] update versions --- README.md | 28 ------------------- build.gradle.kts | 1 + numass-analysis/build.gradle.kts | 3 +- .../mass/data/analysis/AbstractAnalyzer.kt | 4 +-- .../inr/mass/data/analysis/NumassAnalyzer.kt | 2 +- .../inr/mass/data/analysis/SmartAnalyzer.kt | 2 +- .../mass/data/proto/TestNumassDirectory.kt | 2 ++ 7 files changed, 9 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 83a7157..b7efab7 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,3 @@ # numass/numass Troitsk nu-mass data processing and analysis - -## Getting Started - -Download links: - -SSH clone URL: ssh://git@git.jetbrains.space/mipt-npm/numass/numass.git - -HTTPS clone URL: https://git.jetbrains.space/mipt-npm/numass/numass.git - - - -These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. - -## Prerequisites - -What things you need to install the software and how to install them. - -``` -Examples -``` - -## Deployment - -Add additional notes about how to deploy this on a production system. - -## Resources - -Add links to external resources for this project, such as CI server, bug tracker, etc. diff --git a/build.gradle.kts b/build.gradle.kts index c582615..4d49a3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ allprojects { } val dataforgeVersion by extra("0.5.2") +val tablesVersion: String by extra("0.1.1") val kmathVersion by extra("0.3.0-dev-17") val plotlyVersion: String by extra("0.5.0") diff --git a/numass-analysis/build.gradle.kts b/numass-analysis/build.gradle.kts index bc40184..d86ddf8 100644 --- a/numass-analysis/build.gradle.kts +++ b/numass-analysis/build.gradle.kts @@ -7,13 +7,14 @@ plugins { val dataforgeVersion: String by rootProject.extra val kmathVersion: String by rootProject.extra +val tablesVersion: String by rootProject.extra kotlin.sourceSets { commonMain { dependencies { api(project(":numass-data-model")) api("space.kscience:dataforge-io:$dataforgeVersion") - api("space.kscience:tables-kt:0.1.1-dev-2") + api("space.kscience:tables-kt:$tablesVersion") api("space.kscience:kmath-complex:$kmathVersion") api("space.kscience:kmath-stat:$kmathVersion") api("space.kscience:kmath-histograms:$kmathVersion") diff --git a/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/AbstractAnalyzer.kt b/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/AbstractAnalyzer.kt index d910297..b5f5e7b 100644 --- a/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/AbstractAnalyzer.kt +++ b/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/AbstractAnalyzer.kt @@ -24,9 +24,9 @@ import ru.inr.mass.data.api.SignalProcessor import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.get import space.kscience.dataforge.meta.int -import space.kscience.dataforge.tables.RowTable -import space.kscience.dataforge.tables.Table import space.kscience.dataforge.values.Value +import space.kscience.tables.RowTable +import space.kscience.tables.Table /** * Created by darksnake on 11.07.2017. diff --git a/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/NumassAnalyzer.kt b/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/NumassAnalyzer.kt index 26c530d..4dfb833 100644 --- a/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/NumassAnalyzer.kt +++ b/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/NumassAnalyzer.kt @@ -29,10 +29,10 @@ import ru.inr.mass.data.api.NumassPoint.Companion.LENGTH_KEY import space.kscience.dataforge.meta.* import space.kscience.dataforge.meta.descriptors.Described import space.kscience.dataforge.names.asName -import space.kscience.dataforge.tables.* import space.kscience.dataforge.values.* import space.kscience.kmath.histogram.Counter import space.kscience.kmath.histogram.LongCounter +import space.kscience.tables.* import kotlin.math.max import kotlin.math.min import kotlin.math.pow diff --git a/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/SmartAnalyzer.kt b/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/SmartAnalyzer.kt index c421108..67412d0 100644 --- a/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/SmartAnalyzer.kt +++ b/numass-analysis/src/commonMain/kotlin/ru/inr/mass/data/analysis/SmartAnalyzer.kt @@ -26,10 +26,10 @@ import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.descriptors.MetaDescriptor import space.kscience.dataforge.meta.get import space.kscience.dataforge.meta.string -import space.kscience.dataforge.tables.Table import space.kscience.dataforge.values.Value import space.kscience.dataforge.values.asValue import space.kscience.dataforge.values.setValue +import space.kscience.tables.Table /** * An analyzer dispatcher which uses different analyzer for different meta diff --git a/numass-data-proto/src/test/kotlin/ru/inr/mass/data/proto/TestNumassDirectory.kt b/numass-data-proto/src/test/kotlin/ru/inr/mass/data/proto/TestNumassDirectory.kt index ee29675..876ef21 100644 --- a/numass-data-proto/src/test/kotlin/ru/inr/mass/data/proto/TestNumassDirectory.kt +++ b/numass-data-proto/src/test/kotlin/ru/inr/mass/data/proto/TestNumassDirectory.kt @@ -10,6 +10,7 @@ import space.kscience.dataforge.meta.get import space.kscience.dataforge.meta.string import space.kscience.dataforge.values.ListValue import java.nio.file.Path +import kotlin.test.Ignore import kotlin.test.assertEquals class TestNumassDirectory { @@ -30,6 +31,7 @@ class TestNumassDirectory { } @Test + @Ignore fun testTQDCRead() = runBlocking { val pointPath = Path.of("C:\\Users\\altavir\\Desktop\\p20211122173034(20s).dat") val point: NumassPoint = context.readNumassPointFile(pointPath)!!