feat: finish grid-fit.kt
This commit is contained in:
@@ -2,10 +2,8 @@
|
||||
# Copyright 2018-2021 KMath contributors.
|
||||
# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
#
|
||||
|
||||
kotlin.code.style=official
|
||||
kotlin.mpp.stability.nowarn=true
|
||||
kotlin.js.compiler=ir
|
||||
|
||||
org.gradle.parallel=true
|
||||
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
|
||||
|
||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
297
gradlew
vendored
297
gradlew
vendored
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env sh
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -15,69 +15,104 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
@@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
@@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
||||
37
gradlew.bat
vendored
37
gradlew.bat
vendored
@@ -13,8 +13,10 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@@ -25,7 +27,8 @@
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
plugins {
|
||||
id("space.kscience.gradle.jvm")
|
||||
kotlin("plugin.serialization")
|
||||
id("com.github.johnrengelman.shadow") version "7.1.2"
|
||||
id("org.graalvm.buildtools.native") version "0.10.5"
|
||||
alias(spclibs.plugins.kotlin.jupyter.api)
|
||||
`maven-publish`
|
||||
@@ -40,6 +39,39 @@ kotlinJupyter {
|
||||
}
|
||||
|
||||
application {
|
||||
// mainClass.set("ru.inr.mass.scripts.ApplicationKt")
|
||||
|
||||
}
|
||||
|
||||
tasks.register<CreateStartScripts>("gridFitStartScripts") {
|
||||
applicationName = "grid-fit"
|
||||
mainClass.set("ru.inr.mass.scripts.Grid_fitKt")
|
||||
classpath = files(tasks.named<Jar>("jar"), configurations.runtimeClasspath)
|
||||
outputDir = layout.buildDirectory.dir("scripts-grid").get().asFile
|
||||
}
|
||||
|
||||
tasks.register<CreateStartScripts>("fitCustomStartScripts") {
|
||||
applicationName = "fit-custom"
|
||||
mainClass.set("ru.inr.mass.scripts.Fit_customKt")
|
||||
classpath = files(tasks.named<Jar>("jar"), configurations.runtimeClasspath)
|
||||
outputDir = layout.buildDirectory.dir("scripts-fit").get().asFile
|
||||
}
|
||||
|
||||
tasks.register<CreateStartScripts>("appStartScripts") {
|
||||
applicationName = "mass-app"
|
||||
mainClass.set("ru.inr.mass.scripts.ApplicationKt")
|
||||
classpath = files(tasks.named<Jar>("jar"), configurations.runtimeClasspath)
|
||||
outputDir = layout.buildDirectory.dir("scripts-app").get().asFile
|
||||
}
|
||||
|
||||
// Добавляем все скрипты в дистрибутив
|
||||
distributions.named("main") {
|
||||
contents {
|
||||
into("bin") {
|
||||
from(tasks.named("gridFitStartScripts"))
|
||||
from(tasks.named("fitCustomStartScripts"))
|
||||
from(tasks.named("appStartScripts"))
|
||||
// fileMode = "0755"
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,7 @@ import space.kscience.kmath.structures.toDoubleArray
|
||||
import space.kscience.plotly.*
|
||||
import space.kscience.plotly.models.ScatterMode
|
||||
import java.io.File
|
||||
import java.nio.file.Path
|
||||
import kotlin.io.path.Path
|
||||
import kotlin.io.path.nameWithoutExtension
|
||||
import kotlin.math.pow
|
||||
@@ -36,7 +37,7 @@ import kotlin.math.pow
|
||||
val rearWall: Symbol by symbol
|
||||
|
||||
|
||||
class CustomSterileNeutrinoSpectrum(
|
||||
class SterileNeutrinoSpectrumRWallMP(
|
||||
source: DifferentiableKernel = NumassBeta,
|
||||
transmission: DifferentiableKernel = NumassTransmission(),
|
||||
resolution: DifferentiableKernel = NumassResolution(),
|
||||
@@ -61,7 +62,7 @@ class CustomSterileNeutrinoSpectrum(
|
||||
}
|
||||
}
|
||||
|
||||
class CustomArgs : CliktCommand() {
|
||||
private class CustomArgs : CliktCommand() {
|
||||
|
||||
init {
|
||||
context {
|
||||
@@ -100,9 +101,9 @@ class CustomArgs : CliktCommand() {
|
||||
val rwall: Double by option().double().default(0.17).help("rear wall")
|
||||
|
||||
val wallFunc: WallModel by option().enum<WallModel>().default(WallModel.TSV_2025_12_01)
|
||||
.help(
|
||||
"wall model"
|
||||
)
|
||||
.help(
|
||||
"wall model"
|
||||
)
|
||||
|
||||
val fixRwall: Boolean by option().flag().help("Don't fit rwall variable")
|
||||
|
||||
@@ -152,7 +153,7 @@ class CustomArgs : CliktCommand() {
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun fitNumassSpectrumCustom(
|
||||
suspend fun fitNumassSpectrumRWall(
|
||||
spectrum: NBkgSpectrum,
|
||||
data: XYErrorColumnarData<Double, Double, Double>,
|
||||
fitParams: List<Symbol>,
|
||||
@@ -189,7 +190,7 @@ suspend fun processCustom(
|
||||
val data = parse(spectrumFile)
|
||||
val testData = if (full != null) parse(full) else data
|
||||
|
||||
val spectrum: NBkgSpectrum = CustomSterileNeutrinoSpectrum(
|
||||
val spectrum: NBkgSpectrum = SterileNeutrinoSpectrumRWallMP(
|
||||
// fss = FSS.default,
|
||||
wallFunc = wallFunc,
|
||||
transmission = NumassTransmission(
|
||||
@@ -244,14 +245,34 @@ suspend fun processCustom(
|
||||
fitVars += rearWall
|
||||
}
|
||||
|
||||
val fit = fitNumassSpectrumCustom(spectrum, data, fitVars, fitParams, dumpLogger)
|
||||
val fit = fitNumassSpectrumRWall(spectrum, data, fitVars, fitParams, dumpLogger)
|
||||
|
||||
val dataPath = Path(spectrumFile)
|
||||
val reportPath = Path(
|
||||
dataPath.parent.toString(), dataPath.nameWithoutExtension + postfix + ".html"
|
||||
)
|
||||
|
||||
Plotly.page {
|
||||
val report =
|
||||
reportPage(spectrumFile, postfix, data, spectrum, fitParams, fit, testData, dataPath, cliArgs, logMessages)
|
||||
|
||||
report.makeFile(path = reportPath, show = false)
|
||||
openInBrowser("file:///$reportPath")
|
||||
}
|
||||
|
||||
@UnstableKMathAPI
|
||||
fun reportPage(
|
||||
spectrumFile: String,
|
||||
postfix: String?,
|
||||
data: XYErrorColumnarData<Double, Double, Double>,
|
||||
spectrum: NBkgSpectrum,
|
||||
fitParams: Map<Symbol, Double>,
|
||||
fit: XYFit,
|
||||
testData: XYErrorColumnarData<Double, Double, Double>,
|
||||
dataPath: Path,
|
||||
cliArgs: Any?,
|
||||
logMessages: MutableList<String>
|
||||
): PlotlyPage {
|
||||
val report = Plotly.page {
|
||||
h3 {
|
||||
+"Fit for $spectrumFile ($postfix)"
|
||||
}
|
||||
@@ -383,8 +404,8 @@ suspend fun processCustom(
|
||||
}
|
||||
}
|
||||
}
|
||||
}.makeFile(path = reportPath, show = false)
|
||||
openInBrowser("file:///$reportPath")
|
||||
}
|
||||
return report
|
||||
}
|
||||
|
||||
fun main(args: Array<String>) = CustomArgs().main(args)
|
||||
@@ -15,26 +15,22 @@ import com.github.ajalt.clikt.parameters.types.enum
|
||||
import kotlinx.coroutines.coroutineScope
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.html.*
|
||||
import ru.inr.mass.models.*
|
||||
import ru.inr.mass.workspace.buffer
|
||||
import space.kscience.kmath.UnstableKMathAPI
|
||||
import space.kscience.kmath.data.indices
|
||||
import space.kscience.kmath.expressions.Symbol
|
||||
import space.kscience.kmath.misc.Loggable
|
||||
import space.kscience.kmath.optimization.*
|
||||
import space.kscience.kmath.structures.toDoubleArray
|
||||
import space.kscience.plotly.*
|
||||
import space.kscience.plotly.models.ScatterMode
|
||||
import java.io.File
|
||||
import kotlin.io.path.Path
|
||||
import kotlin.io.path.createDirectories
|
||||
import kotlin.io.path.nameWithoutExtension
|
||||
import kotlin.math.log10
|
||||
import kotlin.math.pow
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
|
||||
private class SterileNeutrinoSpectrumRWall(
|
||||
class SterileNeutrinoSpectrumRWall(
|
||||
source: DifferentiableKernel = NumassBeta,
|
||||
transmission: DifferentiableKernel = NumassTransmission(),
|
||||
resolution: DifferentiableKernel = NumassResolution(),
|
||||
@@ -111,20 +107,15 @@ private class GridArgs : CliktCommand() {
|
||||
|
||||
val noReports: Boolean by option().flag().help("Don't generate reports for each grid point")
|
||||
|
||||
// Сетка по u² — значения по умолчанию из исходного запроса
|
||||
val u2Min: Double by option("--u2-min").double().default(2e-5).help("Min U2 for grid (log scale)")
|
||||
val u2Max: Double by option("--u2-max").double().default(2e-2).help("Max U2 for grid (log scale)")
|
||||
val u2LogStep: Double by option("--u2-log-step").double().default(0.1).help("Log step for U2 grid (≈0.1 dex)")
|
||||
|
||||
// Сетка по массе — значения по умолчанию из запроса
|
||||
val mMin: Double by option("--m-min").double().default(0.0).help("Min msterile (keV) for grid")
|
||||
val mMax: Double by option("--m-max").double().default(6.5).help("Max msterile (keV) for grid")
|
||||
val mStep: Double by option("--m-step").double().default(0.5).help("Step for msterile grid (keV)")
|
||||
|
||||
// Дополнительные точки по массе (repeated)
|
||||
val extraM: List<Double> by option("--extra-m").double().multiple().help("Extra mass points (keV), can be repeated")
|
||||
|
||||
// Дополнительные точки по u² (на всякий случай, repeated)
|
||||
val extraU2: List<Double> by option("--extra-u2").double().multiple().help("Extra u² points, can be repeated")
|
||||
|
||||
@UnstableKMathAPI
|
||||
@@ -143,44 +134,26 @@ private class GridArgs : CliktCommand() {
|
||||
)
|
||||
|
||||
val spectrumModel: NBkgSpectrum = SterileNeutrinoSpectrumRWall(
|
||||
// fss = FSS.default,
|
||||
wallFunc = wallFunc,
|
||||
transmission = NumassTransmission(
|
||||
// NumassTransmission.trapFunction,
|
||||
wallFunc = wallFunc, transmission = NumassTransmission(
|
||||
trapFunc = { ei, ef, _ ->
|
||||
val delta = ei - ef
|
||||
trapFunc.value(ei, delta)
|
||||
},
|
||||
adjustX = false,
|
||||
), resolution = NumassResolution(1.7e-4, tailFunction = { e, u ->
|
||||
if (noAdiabacity) {
|
||||
1.0
|
||||
} else {
|
||||
adiabacityFunc(e, u)
|
||||
}
|
||||
if (noAdiabacity) 1.0 else adiabacityFunc(e, u)
|
||||
})
|
||||
).withNBkg()
|
||||
|
||||
val fitVars = mutableListOf(
|
||||
NBkgSpectrum.norm
|
||||
)
|
||||
if (!fixE0) {
|
||||
fitVars += NumassBeta.e0
|
||||
}
|
||||
if (!fixBkg) {
|
||||
fitVars += NBkgSpectrum.bkg
|
||||
}
|
||||
if (!fixU2) {
|
||||
fitVars += NumassBeta.u2
|
||||
}
|
||||
if (!fixTrap) {
|
||||
fitVars += NumassTransmission.trap
|
||||
}
|
||||
if (!fixRwall) {
|
||||
fitVars += rearWall
|
||||
}
|
||||
val fitVars = mutableListOf(NBkgSpectrum.norm)
|
||||
if (!fixE0) fitVars += NumassBeta.e0
|
||||
if (!fixBkg) fitVars += NBkgSpectrum.bkg
|
||||
if (!fixU2) fitVars += NumassBeta.u2
|
||||
if (!fixTrap) fitVars += NumassTransmission.trap
|
||||
if (!fixRwall) fitVars += rearWall
|
||||
|
||||
val data = ru.inr.mass.scripts.parse(spectrum)
|
||||
val dataPath = Path(spectrum)
|
||||
val dataForView = if (full != null) parse(full!!) else data
|
||||
|
||||
runBlocking {
|
||||
@@ -193,44 +166,59 @@ private class GridArgs : CliktCommand() {
|
||||
extraM.forEach { mGrid.add(it) }
|
||||
mGrid = mGrid.sorted().distinct().toMutableList()
|
||||
|
||||
val reportsDir = dataPath.parent.resolve("${dataPath.nameWithoutExtension}.reports")
|
||||
if (!noReports) reportsDir.createDirectories()
|
||||
|
||||
val chi2Matrix = mutableMapOf<Pair<Double, Double>, Double?>()
|
||||
coroutineScope {
|
||||
for (m in mGrid) {
|
||||
for (u2Val in u2Grid) {
|
||||
launch {
|
||||
val fitParams = fitParamsBase.toMutableMap()
|
||||
fitParams[NumassBeta.msterile2] = m.pow(2)
|
||||
fitParams[NumassBeta.u2] = u2Val
|
||||
|
||||
val logMessages = emptyList<String>().toMutableList()
|
||||
val dumpLogger = Loggable { tag, block ->
|
||||
logMessages += "[$tag] ${block()}"
|
||||
println("[$tag] ${block()}")
|
||||
withContext(Dispatchers.Default) {
|
||||
coroutineScope {
|
||||
mGrid.forEach { m ->
|
||||
u2Grid.forEach { u2Val ->
|
||||
launch {
|
||||
val taskId = "${m.toInt()}_${String.format("%.0e", u2Val)}"
|
||||
|
||||
val fitParams = fitParamsBase.toMutableMap()
|
||||
fitParams[NumassBeta.msterile2] = m.pow(2)
|
||||
fitParams[NumassBeta.u2] = u2Val
|
||||
|
||||
val logMessages = mutableListOf<String>()
|
||||
val dumpLogger = Loggable { tag, block ->
|
||||
val msg = "[$tag] ${block()}"
|
||||
logMessages += msg
|
||||
println("[$taskId] $msg")
|
||||
}
|
||||
|
||||
val fit = fitNumassSpectrumRWall(
|
||||
spectrumModel, data, fitVars, fitParams, dumpLogger
|
||||
)
|
||||
|
||||
chi2Matrix[Pair(m, u2Val)] = fit.chiSquaredOrNull
|
||||
|
||||
if (!noReports) {
|
||||
val mStr = String.format("%04.1f", m)
|
||||
val u2Str = String.format("%9.2e", u2Val).replace(".", "_")
|
||||
val reportFileName = "${mStr}-${u2Str}.html"
|
||||
val reportPath = reportsDir.resolve(reportFileName)
|
||||
|
||||
reportPage(
|
||||
spectrum,
|
||||
postfix,
|
||||
data,
|
||||
spectrumModel,
|
||||
fitParams,
|
||||
fit,
|
||||
dataForView,
|
||||
dataPath,
|
||||
this@GridArgs,
|
||||
logMessages
|
||||
).makeFile(path = reportPath, show = false)
|
||||
}
|
||||
}
|
||||
|
||||
val fit = fitNumassSpectrumRWall(
|
||||
spectrumModel, data, fitVars, fitParams, dumpLogger
|
||||
)
|
||||
|
||||
chi2Matrix[Pair(m, u2Val)] = fit.chiSquaredOrNull
|
||||
|
||||
val report = reportPage(
|
||||
spectrum,
|
||||
postfix,
|
||||
data,
|
||||
spectrumModel,
|
||||
fitParams,
|
||||
fit,
|
||||
dataForView,
|
||||
Path(spectrum),
|
||||
this@GridArgs,
|
||||
logMessages
|
||||
).makeFile()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
saveChi2GridToTsv(spectrum, mGrid, u2Grid, chi2Matrix)
|
||||
}
|
||||
}
|
||||
@@ -249,10 +237,7 @@ private fun generateLinearGrid(min: Double, max: Double, step: Double): List<Dou
|
||||
}
|
||||
|
||||
private fun saveChi2GridToTsv(
|
||||
spectrumFile: String,
|
||||
mGrid: List<Double>,
|
||||
u2Grid: List<Double>,
|
||||
chi2Matrix: Map<Pair<Double, Double>, Double?>
|
||||
spectrumFile: String, mGrid: List<Double>, u2Grid: List<Double>, chi2Matrix: Map<Pair<Double, Double>, Double?>
|
||||
) {
|
||||
val dataPath = Path(spectrumFile)
|
||||
val tsvPath = Path(dataPath.parent.toString(), dataPath.nameWithoutExtension + ".chi2_grid.tsv")
|
||||
|
||||
Reference in New Issue
Block a user