From 36c0b9c8c472076e97b94d7f9678d99e8e50a248 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sat, 12 Aug 2023 04:42:36 +0200 Subject: [PATCH 01/11] Translations update from Hosted Weblate (#8) * Translated using Weblate (German) Currently translated at 31.9% (39 of 122 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/de/ * Translated using Weblate (German) Currently translated at 55.7% (68 of 122 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/de/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 2.4% (3 of 122 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/zh_Hans/ --------- Co-authored-by: Johannes Keyser Co-authored-by: Shun Wang --- po/QML-de.po | 83 ++++++++++++++++++++++++----------------------- po/QML-zh_Hans.po | 4 +-- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/po/QML-de.po b/po/QML-de.po index 44e8328..861b548 100644 --- a/po/QML-de.po +++ b/po/QML-de.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-07-27 12:16+0000\n" +"PO-Revision-Date: 2023-08-06 10:10+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: German \n" @@ -12,7 +12,6 @@ msgstr "" "X-Generator: Weblate 5.0-dev\n" "X-Qt-Contexts: true\n" -#, fuzzy msgctxt "Description|" msgid "Predictive Analytics" msgstr "Prädiktive Analytik" @@ -81,17 +80,20 @@ msgctxt "multiVarControl|" msgid "Proportion limits for reporting" msgstr "" +#, fuzzy msgctxt "multiVarControl|" msgid "Estimation limit" -msgstr "" +msgstr "Schätzgrenze" +#, fuzzy msgctxt "multiVarControl|" msgid "Prediction limit" -msgstr "" +msgstr "Vorhersagegrenze" +#, fuzzy msgctxt "multiVarControl|" msgid "Proportion Estimation" -msgstr "" +msgstr "Anteilsschätzung" #, fuzzy msgctxt "multiVarControl|" @@ -103,7 +105,6 @@ msgctxt "multiVarControl|" msgid "data points" msgstr "Datenpunkten" -#, fuzzy msgctxt "multiVarControl|" msgid "MCMC draws" msgstr "MCMC-Ziehungen" @@ -132,7 +133,7 @@ msgstr "Vorhersagetabelle" #, fuzzy msgctxt "multiVarControl|" msgid "Show predicted number" -msgstr "Voraussichtliche Zahl anzeigen" +msgstr "Vorhergesagte Zahl anzeigen" msgctxt "multiVarControl|" msgid "Bin predictions every" @@ -142,7 +143,6 @@ msgctxt "predictiveAnalytics|" msgid "Dependent Variable" msgstr "Abhängige Variable" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Time series variable to be predicted. (needed)" msgstr "Zeitreihenvariable, die vorhergesagt werden soll. (erforderlich)" @@ -151,7 +151,6 @@ msgctxt "predictiveAnalytics|" msgid "Time" msgstr "Zeit" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "" "Time variable that each corresponds to the time stamp of each observation. " @@ -166,7 +165,6 @@ msgctxt "predictiveAnalytics|" msgid "Covariates" msgstr "Kovariaten" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Covariates to be used in the prediction model. (optional)" msgstr "" @@ -232,7 +230,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Spread points equally" -msgstr "" +msgstr "Punkte gleich verteilen" msgctxt "predictiveAnalytics|" msgid "Points" @@ -254,7 +252,6 @@ msgctxt "predictiveAnalytics|" msgid "Control bounds" msgstr "" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Enable grid" msgstr "Raster aktivieren" @@ -425,12 +422,10 @@ msgctxt "predictiveAnalytics|" msgid "bart - stack" msgstr "bart - Stapel" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "Evaluationsmetriken" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Probabilistic" msgstr "Probabilistisch" @@ -439,21 +434,25 @@ msgctxt "predictiveAnalytics|" msgid "Continuous ranked probability score" msgstr "" +#, fuzzy msgctxt "predictiveAnalytics|" msgid "Dawid–Sebastiani score" -msgstr "" +msgstr "Dawid–Sebastiani-Score" +#, fuzzy msgctxt "predictiveAnalytics|" msgid "Log score" -msgstr "" +msgstr "Log-Score" +#, fuzzy msgctxt "predictiveAnalytics|" msgid "Coverage" -msgstr "" +msgstr "Überdeckung" +#, fuzzy msgctxt "predictiveAnalytics|" msgid "Bias" -msgstr "" +msgstr "Verzerrung" msgctxt "predictiveAnalytics|" msgid "Probability integral transform" @@ -461,92 +460,94 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Deterministic" -msgstr "" +msgstr "Deterministisch" msgctxt "predictiveAnalytics|" msgid "Mean absolute error" -msgstr "" +msgstr "Mittlerer absoluter Fehler" msgctxt "predictiveAnalytics|" msgid "Root mean squared error" -msgstr "" +msgstr "Wurzel mittlerer quadratischer Fehler" msgctxt "predictiveAnalytics|" msgid "R²" -msgstr "" +msgstr "R²" +#, fuzzy msgctxt "predictiveAnalytics|" msgid "PIT Binned Density Plots" -msgstr "" +msgstr "PIT-basierte Dichtediagramme mit Einteilung" msgctxt "predictiveAnalytics|" msgid "Prediction Plots" -msgstr "" +msgstr "Vorhersage-Diagramme" msgctxt "predictiveAnalytics|" msgid "Models to plot" -msgstr "" +msgstr "Modelle für Diagramm" msgctxt "predictiveAnalytics|" msgid "Ensemble Bayesian Model Averaging" -msgstr "" +msgstr "Ensemble-Bayessches Modellmittel" msgctxt "predictiveAnalytics|" msgid "Method" -msgstr "" +msgstr "Methode" msgctxt "predictiveAnalytics|" msgid "Expectation–maximization" -msgstr "" +msgstr "Erwartungs-Maximierung" msgctxt "predictiveAnalytics|" msgid "Gibbs sampling" -msgstr "" +msgstr "Gibbs-Sampling" msgctxt "predictiveAnalytics|" msgid "Next test slice" -msgstr "" +msgstr "Nächster Testabschnitt" msgctxt "predictiveAnalytics|" msgid "Same test slice" -msgstr "" +msgstr "Gleicher Testabschnitt" +#, fuzzy msgctxt "predictiveAnalytics|" msgid "Last" -msgstr "" +msgstr "Letzter" msgctxt "predictiveAnalytics|" msgid "% of data" -msgstr "" +msgstr "% der Daten" msgctxt "predictiveAnalytics|" msgid "Model weights" -msgstr "" +msgstr "Modellgewichte" msgctxt "predictiveAnalytics|" msgid "Show per slice" -msgstr "" +msgstr "Pro Abschnitt anzeigen" msgctxt "predictiveAnalytics|" msgid "Future Prediction" -msgstr "" +msgstr "Zukunftsprognose" msgctxt "predictiveAnalytics|" msgid "Prediction horizon" -msgstr "" +msgstr "Prognosehorizont" msgctxt "predictiveAnalytics|" msgid "data points" -msgstr "" +msgstr "Datenpunkte" msgctxt "predictiveAnalytics|" msgid "All data points" -msgstr "" +msgstr "Alle Datenpunkte" msgctxt "predictiveAnalytics|" msgid "Advanced Options" -msgstr "" +msgstr "Weitere Optionen" msgctxt "predictiveAnalytics|" msgid "Skip between training slices" -msgstr "" +msgstr "Überspringen zwischen Trainingsabschnitten" diff --git a/po/QML-zh_Hans.po b/po/QML-zh_Hans.po index aa00976..b815e7b 100644 --- a/po/QML-zh_Hans.po +++ b/po/QML-zh_Hans.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-07-27 12:16+0000\n" +"PO-Revision-Date: 2023-08-07 11:48+0000\n" "Last-Translator: Shun Wang \n" "Language-Team: Chinese (Simplified) \n" @@ -22,7 +22,7 @@ msgstr "该模块提供预测分析。" msgctxt "multiVarControl|" msgid "Control Variables" -msgstr "" +msgstr "控制变量" msgctxt "multiVarControl|" msgid "Only include previous" From 28dbc7301dd9efbe00180ba85efe38783deca96c Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sat, 26 Aug 2023 04:42:10 +0200 Subject: [PATCH 02/11] Translated using Weblate (German) (#9) Currently translated at 60.6% (74 of 122 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/de/ Co-authored-by: Johannes Keyser --- po/QML-de.po | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/po/QML-de.po b/po/QML-de.po index 861b548..b50d50a 100644 --- a/po/QML-de.po +++ b/po/QML-de.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-08-06 10:10+0000\n" +"PO-Revision-Date: 2023-08-24 13:55+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: German \n" @@ -125,12 +125,10 @@ msgctxt "multiVarControl|" msgid "Forecast plot" msgstr "Prognosediagramm" -#, fuzzy msgctxt "multiVarControl|" msgid "Prediction table" msgstr "Vorhersagetabelle" -#, fuzzy msgctxt "multiVarControl|" msgid "Show predicted number" msgstr "Vorhergesagte Zahl anzeigen" @@ -191,7 +189,6 @@ msgstr "" "Erstellung von Prognosen erforderlich, wenn Kovariaten und Faktoren " "angegeben werden" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Time Series Descriptives" msgstr "Zeitreihen-Deskriptive" @@ -280,7 +277,6 @@ msgctxt "predictiveAnalytics|" msgid "Histogram" msgstr "Histogramm" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Lags" msgstr "Verzögerungen" @@ -310,12 +306,10 @@ msgctxt "predictiveAnalytics|" msgid "Evaluation Plan" msgstr "" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Training window" msgstr "Trainingsfenster" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Prediction window" msgstr "Vorhersagefenster" From 27cb4196ad103fbd413d7c1c980d5732f7e8fe2e Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sat, 26 Aug 2023 04:42:13 +0200 Subject: [PATCH 03/11] Translations update from Hosted Weblate (#6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added translation using Weblate (Spanish) * Translated using Weblate (Spanish) Currently translated at 100.0% (23 of 23 strings) Translation: JASP/jaspPredictiveAnalytics-R Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics-r/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (23 of 23 strings) Translation: JASP/jaspPredictiveAnalytics-R Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics-r/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (23 of 23 strings) Translation: JASP/jaspPredictiveAnalytics-R Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics-r/es/ * Translated using Weblate (German) Currently translated at 69.5% (16 of 23 strings) Translation: JASP/jaspPredictiveAnalytics-R Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics-r/de/ * Translated using Weblate (German) Currently translated at 73.9% (17 of 23 strings) Translation: JASP/jaspPredictiveAnalytics-R Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics-r/de/ --------- Co-authored-by: Raydel Pérez Castillo Co-authored-by: ecadrian Co-authored-by: Johannes Keyser --- po/R-de.po | 4 +-- po/R-es.po | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 po/R-es.po diff --git a/po/R-de.po b/po/R-de.po index a39d3e8..4258384 100644 --- a/po/R-de.po +++ b/po/R-de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: jaspPredictiveAnalytics 0.17.3\n" "POT-Creation-Date: 2023-07-25 07:41\n" -"PO-Revision-Date: 2023-07-27 08:07+0000\n" +"PO-Revision-Date: 2023-08-06 09:49+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: German \n" @@ -25,7 +25,6 @@ msgstr "" "Zeitpunkt werden im Durchschnitt %#.2f Datenpunkte mit einer Untergrenze von " "%#.2f und einer Obergrenze von %#.2f als außer-Kontrolle eingeschätzt

" -#, fuzzy msgid "

No warning. The limit of %#.2f is not crossed during the estimation period.

" msgstr "" "

Keine Warnung. Die Grenze von %#.2f wird während des " @@ -40,7 +39,6 @@ msgstr "" "werden im Durchschnitt %#.2f Datenpunkte außer Kontrolle sein, mit einer " "Untergrenze von %#.2f und einer Obergrenze von %#.2f

" -#, fuzzy msgid "

No warning. The limit of %#.2f is not crossed during the prediction period.

" msgstr "" "

Keine Warnung. Die Grenze von %#.2f wird während des " diff --git a/po/R-es.po b/po/R-es.po new file mode 100644 index 0000000..a919780 --- /dev/null +++ b/po/R-es.po @@ -0,0 +1,104 @@ +msgid "" +msgstr "" +"Project-Id-Version: jaspPredictiveAnalytics 0.17.3\n" +"POT-Creation-Date: 2023-07-25 07:41\n" +"PO-Revision-Date: 2023-08-04 12:02+0000\n" +"Last-Translator: ecadrian \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.0-dev\n" + +msgid "Column input is wrong" +msgstr "La columna introducida es incorrecta" + +msgid "

This is a warning!

\n Error proportion limit of %#.2f is crossed for the first time at data point %i in the estimation period. At this point on average %#.2f data points are estimates to be out of control with an lower limit of %#.2f and an upper limit of %#.2f

" +msgstr "" +"

¡Esto es una advertencia!

\n" +" El límite de proporción de error de %#.2f se " +"cruza por primera vez en el punto de datos %i en el periodo de estimación. " +"En este punto en promedio %#.2f puntos de datos se estima fuera de control " +"con un límite inferior de %#.2f y un límite superior de %#.2f

" + +msgid "

No warning. The limit of %#.2f is not crossed during the estimation period.

" +msgstr "" +"

Sin advertencia. No se supera el límite de %#.2f durante el periodo de " +"estimación.

This is a warning!

\n Error proportion limit of %#.2f is crossed for the first time in %i data points in the prediction period. At this point on average %#.2f data points will be out of control with an lower limit of %#.2f and an upper limit of %#.2f

" +msgstr "" +"

¡Esto es una advertencia!

\n" +" El límite de proporción de error de %#.2f se " +"cruza por primera vez en %i puntos de datos en el periodo de predicción. En " +"este punto en promedio %#.2f puntos de datos estarán fuera de control con un " +"límite inferior de %#.2f y un límite superior de %#.2f

" + +msgid "

No warning. The limit of %#.2f is not crossed during the prediction period.

" +msgstr "" +"

Sin complicaciones. El límite de %#.2f no se ha traspasado durante el " +"período de predicción.

" + +msgid "Basic control plot" +msgstr "Gráfico de control básico" + +msgid "Autocorrelation Function Plots" +msgstr "Gráficos de la función de Autocorrelación" + +msgid "Histogram Plot" +msgstr "Gráfico de histograma" + +msgid "Mean" +msgstr "Media" + +msgid "SD" +msgstr "DT" + +msgid "Minimum" +msgstr "Mínimo" + +msgid "Maximum" +msgstr "Máximo" + +msgid "Valid" +msgstr "Válido" + +msgid "Percent" +msgstr "Por ciento" + +msgid "Average Deviation" +msgstr "Desviación promedio" + +msgid "Running model" +msgstr "Ejecutando modelo" + +msgid "/" +msgstr "/" + +msgid ":" +msgstr ":" + +msgid "R%s" +msgstr "R%s" + +msgid "Cannot compute forecast. Larger forecast horizon requested than indicated by 'Include in Training' variable. Reduce forecast horizon or change training indicator" +msgstr "" +"No se puede calcular la predicción. Se solicitó un horizonte de predicción " +"más largo que el indicado por la variable 'Incluir en el adiestramiento'. " +"Reduzca el horizonte de predicción o cambie le indicador de adiestramiento" + +msgid "Warning! The process is predicted to cross the out-of-control probability threshold for the first time at time point:" +msgstr "" +"¡Advertencia! Se predice que el proceso sobrepase el umbral de la " +"probabilidad fuera-de-control por primera vez en el momento temporal:" + +msgid "No warning. The process is not predicted to cross the out-of-control probability threshold. The highest out-of-bound probability is:" +msgstr "" +"Sin complicaciones. No se predice que el proceso sobrepase el umbral de la " +"probabilidad fuera-de-control. La mayor probabilidad fuera-de-límite es:" + +msgid "percent." +msgstr "por ciento." From 855ed6b56821e35618c6c6de39d9934bbff01a2f Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 2 Sep 2023 02:43:25 +0000 Subject: [PATCH 04/11] updated translation files --- .../LC_MESSAGES/R-jaspPredictiveAnalytics.mo | Bin 1470 -> 1907 bytes .../LC_MESSAGES/R-jaspPredictiveAnalytics.mo | Bin 0 -> 4035 bytes .../jaspPredictiveAnalytics-de.qm | Bin 9187 -> 12286 bytes .../jaspPredictiveAnalytics-es.qm | Bin 10735 -> 14883 bytes .../jaspPredictiveAnalytics-gl.qm | Bin 10533 -> 14637 bytes .../jaspPredictiveAnalytics-zh_Hans.qm | Bin 194 -> 263 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 inst/po/es/LC_MESSAGES/R-jaspPredictiveAnalytics.mo diff --git a/inst/po/de/LC_MESSAGES/R-jaspPredictiveAnalytics.mo b/inst/po/de/LC_MESSAGES/R-jaspPredictiveAnalytics.mo index 766c4b1df5f17e7b0df9cbde3355bd50889cfe30..c779641e04356e6e27b5def7c6723bbc24a708a4 100644 GIT binary patch delta 853 zcmbu+L2DCH5Ww+CjaE~w+Tua5GPD#=O=}TpODG-+77AWc?7>4wc3-%Jrx`>`^&!FeKWKBb?V3T;M+|3tq?Qh4e|py zN7hOlh>sZlekvT|F6W;MD-$9&Id9-qe1Y%rHD1HjGa}Qtjgz>CWo#Uu4R%D5iQ=r1mEC1{=`|FJ16oTZ{u~GrHcwK;iL>i){2FD z;{}nO!a7n*9${#xQLMKxH1rrl11BR)8lDMpnGA1)+r~jZLJ#A($ngq!iTdLR1^z_% z6d^8L#` zKKwPYT^fx0-!V2dy2l9JFv6BKdf%C}Z}bU!91qd6F4o@YDB%J#m|W{oGCJ~o9?AR0 ude`i>8PrCJ*U^`jae0(D>%B=&%=B-i`sqqN%v{2T%>#3aO2e&kzw{e9*r}WV delta 414 zcmXZYK}!Nb6u|K}?yBjkSs@}sg!gFivaz>_prfBaZ{Zg(6qALz)lEneMDZdL*k$S3 zM=AOY-8}h!yEE*2zxSA7W_JE7-(K`{?7j)3N}LjNqOP?eF$SpR&^p31`Y|5i99Q^> zHEd@@DtM21?4yfg+do-f&=HAbLcu3fQWj@;fJ=O5(+z@Lvx|CzO}xbu?BO3iVgoyD zQp5r31)gpHYWt~mfez=(nu0Ur!%l2bFYtwWpw8*gO>;?=rh=_?Elb5C_#-(a^fkFp n@)Bj#QA$a&UQ8|}l(?IDFvZ}a6`cE5p&!J*&Yg*O*`e73axx-9 diff --git a/inst/po/es/LC_MESSAGES/R-jaspPredictiveAnalytics.mo b/inst/po/es/LC_MESSAGES/R-jaspPredictiveAnalytics.mo new file mode 100644 index 0000000000000000000000000000000000000000..3d06253a02f6d4aa073aebc8771154010e39be83 GIT binary patch literal 4035 zcmd5;&2t>Z74LuvWPunvp9LxE$=JAxWM)?~B(Bv*p;+=ql?5tW*f}NXooVg1Yo>eX z?vapgN#&5@3OP{40bNqb!6zTMqkn<}1sDDhey?XnE7?*N6j0?Zt$y1(Z{B+G=!eS{xtA;;4gqM zDQ19BDb53H;A_BVfS&+AfqV{HMk1=JNDOr6X5@VIRwu1gpk0kXNC9!e*gSA zA$|#b3dUXnz6ksp_($M*;7f4+*T6S{Fd^;&*^j@qdj^n-}l9^_%t!bILK}#d_Em=9PVp`~aB;&=(i`z>7I#KY6hq za4#OgjrF1(V?ZIbq6 zY@p0p?^RBD?I1}3g31S7%Al>GN;z%wbfI4@eNUy8Q@PHLQ|iM`p%%|&wyI(e-+XB}0}R@OyxkDj|b^CkrOz?<6nKsdA_87P-Q zQf0LXbU~9gCvZZ`c!fP|L_wC^QcjLl%kNYTPT&q$Ri1*Sks@2iU}V+=XA9caVM5YS zVYiigI9Af+{H(4JkB6Uiv3aa$1Z&{#Fa<4-kEX$Q;c;6R#ShNiavf}Dol`}V^H*!r zWXq}!NGR)6CVfchrgUS(towl`*6Cg3 zic{~_s52B^m>{y+pg1INM>}-!hRKRLSDbqrPHHaUi?k)3mZL(YbW7!RHZ^jf6WN?W z88R@mZ*_XD6IX0emuv_Qa#3wNYsTWb_Q8&wEQt>**5rG-tV^+`q!DW{%$tY%2udqc zK2|25xs52F#5Ua|77Wrmv75;OOU{nuNEbTn;IUJFVvD@#OA|ewfC?@Meq&^7WIK!; z$ZJ0o>&j)y1aa$v7q@D|lu&7NRfyXw;*KnIF77tXZYDOnLr#7V2RUx>G)Fr`>=d!= zhXNJJj-_JV*?TGr$&Ea@qntxr@@zWjT|rL+C&|W6g);^9Ug%c^@_3%}(|HvZ-`TjDT%OAD z(KeM!R!wGegmy@mM>_P@i`vN|xoTbMhh(a_^^0@!)O=kuG_y#v^S!?$*OWo?jpW>I zPDO8|gCtj5z3D`}je?Rn>KWc;TBd~5_KJLsAWBjN75n!wBNd_cnjwj)C~+2k1{sV( z%g>qtnd$upCXPm0sG8}>1`vR%Krv^Cs`4qV9;4PoyA#QU>MQ9b>pfy>|9)$$iNe$t z8+x?Wt7c+;wzrCUhJREWdHAT`ZgL*+6bXR|8V$!Y$FX`q3~0+-y~~4=hb=}Y7~E33 zq)a5MHt++|7y;JvENFi}oO$h;glvt? zI4Vl%HcH>3RCU;Yz&X**=BEA+Nm2=|c-xIFVQO=JH}e`*%jplj-EeMaw{~s5%Upv; z%vX(mXfHOidpC>C=0tNCqp}=n(85;$z8K_9{vOpPZb~FQPjv|~Tq1ER&^c6NG^3B= zLX!n~geBZon`tk_+WsC!y~U)@HSg|Y)?0C0|7xj>#HsH52m~3>|Iz$>K)`4c+YS&c$yoA7gdri5OTl5#vbkH5mA&0#Z!do{ znzo>0+i9&Vs6#CsOF$hJ7*4EKw1@-RA`S>@N7B|Ilo^>$ol>fGN^75Q*Blpz8J(Nt zyW8)3-}iZ+=lR~9?)u;NCR$#Mm;d48$9J5ZQ~A3MPrUM{HX_$DqE#J4dCf$3ze7~H zlH3n%A@aRM?nj;?a$`FY@28Mw z!g(9=HqTqccHA58i^%^C z-~PLzKzzw}q&$U`HKOVHTcKgeHWDL{ulp)0)c)0V~z8O zZkXpk5ka1++x@5R^@72}{=bSQ;%fbuzx6WFMD5DJcX$1nXr3Mz3q6YUWZ?cMkVq&F zJQHpQkZ|C+7I?#bByi}-dttV4;CMH*D|;(&Y3u7)n*yKz@$cBL3l^+D25F{(OAek# z{C|V@FM%XCz82gQp2pf7TKV+P@O&~f{=yle@UgtU-RDW7lKQ;8%`i)_AaA-}!g^nL z$qFR)9uNPj7M=*N4WIkVQgkvL{_s0J09YJhO^ZS4xyU*l9py(O`#0@|M?Q_5KD7dj zr6W_Hj1bLzMTWqWE{L+g{K&Z=^Hb-fV_`W(DMmwdfead_LDGRh#W%^vZ-EDY`JE|4 zPKbuAsZ5a*vSGgFsxY^D3N!8QN1e@#){usnG~frMMi+P2_pHg;6UC z8i;@ycrCsU*4 z1}^6{l;s`bh#WuveKRTzh_HgF$}APrbUSZ4cy~cH@=6x1Iwg=rHJ25a`#K~;(i5_3 zZYZ8>o(Z1Ww2V4YB!#016y^jqQX2}7;oFSv{2QZgkjXogNr?eP zVr}A>lmaByt;HpUwOSpc=EHNV&Ap)wJq@U-(+H~Q$YBwL3XP~B(kL?X?40S@)ZNfI znv`OO<#{xo5J%zranaaT!%R=!E=ar%5jNo)kv9c-bzmMue;R&WBd=h2+DPjX`@;H2 zu&9!{P;>wv4kQX734|+nmTUHKmpm|#Vkt3^RKDnEGVe-Nm{tKVzp9o&vy8Y`K^jZw z$HI#jP$7tDze*dl1k4-=Z+G=A0v9&JToG=09SVpRJPokYb|pMpj=do~!HI0$ zqHYP~ivuZ5NgEQAbY0U;M^Q~xH;x%NZV8z^?&+3{AuVnJ?I`S7SUF2-es{S$`8>+K zCwaEGBa%Eg#BWJ!-K;Qv(Kgam3wH;?`2^A}S`*pAVJk(785&C}n#I)e2I|4s0=E%75AY^F4ko;J<99NRKpXFhfciETzaX>lRF`p>qQ?a%zG+In%+=ZW?NyKqpWV$ zFr1mjjpq8I8}svX<}VNC18b|N)%4a>WX=|S=1^8*_N74`A3h3@&s@D+V{FC=5q)ri z`P{I_wN2jj3{uvoX$DJhm!vkQMZ5uKOcJUpbW~i1HyD!HnVyA+QLM| zg!Cn0IvXGiznOd}^9z@wD4y}5$D5VmnA~?lI69<_u%x8tNZg+txAtwft}Bm1o^i{z zGgR;={T4y|jD3zP@#Xrt6)U5gbIbv#znTyssbDDCnJ6%7wmFn<(gh^C>CqG@ewqEr%MNd+B~ z2O*Z`1(k|pC1z$x=0T!a6u4=&5d~7Dc8H?AB;Swcsv{)#*~D1Wx5RisHu46 zX?U7m_vAwapoj(HqX5AM%E}giiC9C`7`V+=KsyU=XEf~@)=;+_TzdfEXhGDs1OUlM z3X}o6Ur27bLGz zs$RgonEPpdM7W{~aV`S%r&Ud+Mj{kdgEdM@+Qkdq6~KlDUYu>903*Dw8{eN6YtepZ}s)Zt5 z72&*4R`-^K&BBA`GxUUE!oWUi-Y&;SSbhJU8n9@CIzEv@rMA)53OLN@iXTo;b+>Jr zLa2Imz3t?5FwG6NAHx%fFjzDO(wlQ%#bgstgr#Cz&K=s{D~^xFk>PmJ^1BdNXU(P> z&#}~nw=~0g%Vlf>BMtHn@&&F+A$hwyOXccfk5C*$K1?`*0-U6ijSOVLjNG-GY}RBm zj9z-C)l1j3JLDu?J|pRD$D~;Cu(T*nNQw68l9xlRly>rh!_uQ*%&3$^$%$EcCuU~t1`|pbje!2SjU%XvQlzf(GVLee+3DK(aM5X)4 zx^)v#dIMRX-a}+L5?|9FB(D4tQGPXX6+5tQAg-zb=N<7ie=l+StBK05QvKD%M6`mI z)x?PS*|cKMQ+VG_D|>RY@PSC)^)XS>0y^R^B^u|XbB{knRP_W6Rewa}Y@?h1`X|xk zIhOM@iD=Sh%YdVcsO&$M!H=Uvg-w=Ar?Ag5WcgfeB)WG>()9iSQRc6c9^Lc-(U^%z z`+hfw_n#&maGW7Z<>G7c*rc9gg#gSwopj}=#YB$YOZcjdc2?X6& zt(8+j$a>T&zoHRw)2!;1AQWo09=!M*&bM;zfkRO0ZH`}FN0f1co7vw2V!2$~{l{>w zm|L~9lBlGHlYaoB$zSK%xfoH(ldI!5{CBuVww@!h4{^JHcpTF7b4U08k*N9_H<I>bo@SKtQ>Y1ZNl{eDHpG3~Z-%ER9VlqTO zoYudx8KH{PepTm34$EvsjeXE)&{lNeA1G4T=B);myA@m4n{T4}@7P|x0ep9%?X}AB zz`1NY#Ha@hXjOt>RevcI%hLX{WV5AEIvz#jX_MJQfT#QxXK$3bY&{`sH& z22qbYoEJVN^42>t+Fk>JF^*{m-Y2s4XpSw@P>s@R$4=KJqVYS^7wqjNN?V`aefSNc zoZab1dQp|T+S331iWfjGXKw3d`2Hp5l0EdE=dWUkVU9k`AiI!yzxGugk9X5E&_3rG&$b5_2dhZF? z;Yl}NQ;q6>(><>TQsrE6uTYs}C)|(yL5JOTxck@l0Z@0JJ3Akx`OH1|Ne9jsK#rQP z#f~Liw`7vW5=`x?l*|MX^K9EK6=PiKJ1Glr+|BDY&e)l3-kSjx$cW zY8ZI3xSLYnZBt7z!Gti(F&U>4h!rCNl$08p50wcyf)XKk1jd&eY@Y29!!M)8XqWK9hFLLy%)bcq^x@{5#!7~3Dm z2I`~;IQan}n0mEitwiPmzDTA5-MAmtJCXm`hR%rS*G*KY85TOFu+%LW5l?aK&)Hs! zrNr2ulU<4o=OVW|%bPJbsz+6kZ&Jm8WGJ4J86`*}YHGt05ly|~m2CtIAO5sNY*(Y? z^J%;$gd-sc5qmGkZSkbj03>Gx58qNI>p~RSRO-Xr>d92_6&_->3MTMv3zcBP6a_JF z-lNHLE1;B$KLr;LJ-`R|Au~5t$1pgXbxxpUEfP^Q!KW#qs4nuNswygDl9xVQFJ_a` zf~Od**Roa@~a6?8wdw zxR}7K;~Am|WLA1Lf#NbzG+tNuNJuf&E4&{~C87JH_#Z#PnvRu9p>AV!N)8`yH!*?Y zUMzO%ye?`wuZ1MP*~mRD)QBVR(Hg+qZdI17Y<9+-gNJo8Q=SDFF*d6gdupQj)RG99 z-!#94ua#sObEjUEH8yjakb#E5N?8%io|~Q=gY!J)WMge45yjZ$*_ko%HfBIK9_Gdv zt@eE5ny1A0M!_k}g(frI(INSzbD?Qu;El|Mj1|;k(r4+d0ddus?(i&Qvy%;(p!tne zG;a5=n8b-B$0Y(FJ4x2XpelrT9phG8qo`qX66F>?U}>99OQ6{hbq_(Q32gL>f=l+0vt&2N?vm801KW|1W%!|I;GPLRh@jBKY+(I>xrH<}_dw;(ldrPtalZF*-{tJq69{ zr3mj6^$t;#nTiv4#!dM Q+%SwXvI!{0-n-}i7gxnI#{d8T delta 786 zcmXAndq`7p9L3MwcK5j3?$wr$)qKn~B}sd_RhB{7Lo16S6f3jTKTH~7>j^a?gRG3| zW1fNKs3ASXrWzqD5vg&63`)Z|tvg`8~epoX_u8I)_)g<}~Jp-XAV6 zePA}-&aSxGKOd0Q0Lzkr03Q^m>6>Zts}5jeyntZ{?39IoTwu$rl;)?R>+n9nvI{;}!e>Bd!>?~&feG#{9byTnOxiQc#1HO``a@_ zRa&(A7e9dUZkN_x_ZrY_(^m0bT8Pl4UN{D*3v_#~J|!pyUDGk@&X4N8U$@dlUccr9 z!8P&v>O_LhN9mtu(|$-1Z%=6fI3J%>p9BOp^3um-(r~`-c2jQ=E-nGz&p*de)?WX=$? yET{B2$b$n;Y{X{diGM9sqT1RiwMK7X#Ay?|r4O;atT;HeSb8`8mt5?hwdfywUF9?Y diff --git a/inst/qml/translations/jaspPredictiveAnalytics-gl.qm b/inst/qml/translations/jaspPredictiveAnalytics-gl.qm index 36d63e22cf30a38ebcbac61b4ee83b228e74b42f..d397a93658df7488f23d7cd6efa010b5accb49f4 100644 GIT binary patch delta 3203 zcma)73vg8B6+Zj8o9rgLn>QiP8}c-gkW>OnBAvWID9L0JUSmSa-OXjWW%u52@6EH5 zrZWUbEd%29G3_`agFzTdf&{D@Yg-grt5QI%9gWf&u>;d6R;z`!W554yc7wFeIGN3V z_rL%Do$q|-J7-5*kE+8p&vvE%{*%WZemyViSDW|$^1V7D+c}~&4Ma)L6Lnr7%D+zb zJv)fvu95wbLqwLz@EX5}xZ-J|c_)c0c@pcV#8ounz9qb-R}y!uil{h`8ZI{z(R$jj zWP&JnAKiWEA)=x&+BBS&j2A@m!Ow}Tt7+0-K$Ja1=kNa!(V|Cbrs^{ycRc<3pI;JH zG+8cCIZ@dImUrR?0C0z8>hm6=td}j*ui~6##`2ZAlBj&Sb=i0q67XB^-SHt&`f=;n zD^tL8SdYh@C30L2uYA9C_*6Ck)7D!*`gtBQTy5*1F{0b^i*=vv!ZZka_t?u8 zgOL4@U4Bj@;_~e3M*#%*#D3!4$B9yBIPW_ri3)Dv_>J{MiTk*k@wFg!Ki6^lDcnou zI@gsE~Ow@sDD^#^Kbq?Qu(we?a6Mz9VkuQdA>dS9Zan~itXtgc_MQdsW%t2q*vebs{^Mqx&phLvzE#9M z)w6UJh`6qLmY;yKDY9o@!5G$8JQG(Nh&CkmdfvUb41r5MfBtSWGT-a9FM1hv820i@ zs&LWmy=xd!r4D-URI*9D@j&C~vpjhwubE{CAG4IqDeYjr^IjZU>PFcrY zwiGHfD&3hbXCbd_;kyJ~F!s;Sp4je=v!peXNE!u5iDkX!z{g%E35JlAV+?wh40liq z^^iuqn6H^Z_I$PYyi7H#+y&3Ht=S-Xh4-r)>0HVy+P=cx<2@^(I)x?O_u~& zin21^Ox(OU3s531GEyNk!I@bg2oZ&GH;B5Zh9p@6hTp8h;-nVK50+CCQewgdO`)3b z)CCkKS{8VtY&gnfhl-Gl!qoC~IQK7ZmwAVL;SClW$VG#2{a5sv^k&7Sk9> zelT$%LS6=86|jDmwb7nan2^-iD+GH4T~csU)K%mANxYGk(q3FajfmF`9)4UBOo@82 zmLXdKZzMD8L8CGyIWwcNzgzU{CJH1A3H?$?8Z^I#jhB*Xso_xk6A@Q4^$ACedM!%Z9rj6|Ckx({o6H!SaLuBlB#Py27W;Kx7d4&Nf@l`>ztQMO z@P+e;R9iOt;(x~uYvgcUBYCs6g;vqpXoU2ZRcrY=NtQ8h8bn!Rqo#$?X47vVV^?yL zDW!^w{@G*|BO`M(u@n|l=`XYeDTRCIhg^m+<#c)z=1j_a9LZ|8Y+ORE2rxr~CJZYFGtIZR>bzD((fJVbtG2yIK!?uRHOUU}<59J3t*4H& zz_leX7PC(XDSb;TvY%BD66Uol<7nDN>dekR99+Q5KbGl!}6gM57WGfv_aL)C3TaM4Ko^5j5fm z4+b$r%OWDk;DRU+QQT1kmuPW=XdvPe5fwFh6Q0iGzw@7SzcbUAZP{QBznr1J`?<3G zftOonYW20jm4K`ch%o|o#ZXkxGt)k$d@I-)Lx3(9Y~U(D&P=JU8EkVf;5Go`NGyQO z*b*WE`aMXfJ4WYeNOscEIbf<8C;w>l9o!9gH)G5k{0-no@#p6cz$c4&!S4iIKQh+w z9e{HpGjxyU%$RIRQwA**Bs;Kom=+k8ox5Wt0}ojX-wP;5rd0n+_WrCF`LXiHLlh{? zQOsLJL5ezssVxU!y%eo4s{s3C)-yf=(3;qkq_FGsf{ryEp&ww9fyh&FCt^%KCx!Zn6dnKo;=^F`aJqe$*T?Ji>L;d<5uPt>fprLPmd6sPQLC7L zgE}>9Jwxd4-~u$-HD(*SFse<+Ce`uU;)l5uRI2TJ6h%#xYONFbfahDn@lTgVOwuPxvkb0`_}yhx^l)1!opdXZi!Gk< zVwZQRqXXiw9oa}nCQQgh8VZmprubOIEZ>`w-anBM^Jex-GiIM*#qWW|(sKCg F`5zFc=8pgX diff --git a/inst/qml/translations/jaspPredictiveAnalytics-zh_Hans.qm b/inst/qml/translations/jaspPredictiveAnalytics-zh_Hans.qm index 7fe39d43783d5dc1284f8154228ccbda1142b729..9ec78c4d60a50ccf35d41480f4c70b17a6edd51a 100644 GIT binary patch delta 102 zcmX@a*v>RTL{5Ui<)t431A`4ite7y6W?+1L`ZJK4kqIQOPSl!V%M4_2Brgv#3%)V& rJO_}&zy`#E&iQ#IMfo`jVTnbViAg!B#q2;){@l`>l1!iwRF)9{Bb0ZL`;Ce<)t431A`4ite7y6X2=BM8550W004402Cx7C From 2acec73c802359c0b871ee6c27d47591807cb151 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sat, 9 Sep 2023 04:41:35 +0200 Subject: [PATCH 05/11] Translated using Weblate (German) (#10) Currently translated at 62.2% (76 of 122 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/de/ Co-authored-by: Johannes Keyser --- po/QML-de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/QML-de.po b/po/QML-de.po index b50d50a..ed6ff5b 100644 --- a/po/QML-de.po +++ b/po/QML-de.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-08-24 13:55+0000\n" +"PO-Revision-Date: 2023-09-08 08:59+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: German \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0-dev\n" +"X-Generator: Weblate 5.0.1-dev\n" "X-Qt-Contexts: true\n" msgctxt "Description|" @@ -100,7 +100,6 @@ msgctxt "multiVarControl|" msgid "Summarise after every" msgstr "Zusammenfassen nach jeweils" -#, fuzzy msgctxt "multiVarControl|" msgid "data points" msgstr "Datenpunkten" @@ -289,7 +288,6 @@ msgctxt "predictiveAnalytics|" msgid "Feature Engineering" msgstr "" -#, fuzzy msgctxt "predictiveAnalytics|" msgid "Remove zero-variance variables" msgstr "Null-Varianz-Variablen entfernen" From 87dc42f53579950e2b08815f161dd2657a2f32b5 Mon Sep 17 00:00:00 2001 From: Fridtjof Petersen <65158001+petersen-f@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:43:28 +0200 Subject: [PATCH 06/11] Fix predictive analystics module (#11) * removed parallel processing * removed multivariate option for test release * added imputation of missing values * fixed prediction plot display The actual observations were not shown as first factor in prediction plot as they were a separate column from the predictions. This commit merges them in one column * fixed bunch of stuff * some bug fixes - default values for forecast settings are now set based on data, previous values were set arbitrary and large and broke small dataset - additionally pre-processing now only happens if at least one covariate is present - previously pre-processing threw an error when no covariates (only time variable) was provided - additionally engineered lags and time-based variables are now in model dependency to recompute models once changed - lastly lag values are now considered when forecast evaluation plan is created --- DESCRIPTION | 6 +- NAMESPACE | 1 - R/modelFunctions.R | 9 +- R/predictiveAnalytics.R | 236 ++++++++++++++++--------------- inst/Description.qml | 12 +- inst/qml/predictiveAnalytics.qml | 103 ++++++++------ 6 files changed, 192 insertions(+), 175 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index efa271e..24d08da 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -13,17 +13,15 @@ Imports: jaspBase, jaspGraphs, bsts, - parallel, bssm, precrec, - future, - future.apply, reshape2, Boom, lubridate, prophet, BART, - EBMAforecast + EBMAforecast, + imputeTS Suggests: testthat Remotes: diff --git a/NAMESPACE b/NAMESPACE index d05a70f..7bea117 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,3 +1,2 @@ import(jaspBase) export(predictiveAnalytics) -export(multiVarControl) \ No newline at end of file diff --git a/R/modelFunctions.R b/R/modelFunctions.R index c0e7e54..da1f04c 100644 --- a/R/modelFunctions.R +++ b/R/modelFunctions.R @@ -1,5 +1,5 @@ #### bsts functions -.bstsFitHelper <- function(trainData,formula,method,niter=250,keepModel =F, ...){ +.bstsFitHelper <- function(trainData,formula,method,niter=500,keepModel =F, ...){ trainData$time <- as.numeric(trainData$time) ss <- list() y <- trainData[[all.vars(formula)[1]]] @@ -44,7 +44,7 @@ colnames(trainData)[colnames(trainData)=="time"] <- "ds" - m <- prophet::prophet(...,weekly.seasonality = F) + m <- prophet::prophet(...,weekly.seasonality = F,changepoint.range = 0.9) if(formula != as.formula("y ~ time")){ for(reg in labels(terms(formula))[-1]) m <- prophet::add_regressor(m,reg) @@ -204,7 +204,8 @@ reg_vars <- colnames(trainData)[colnames(trainData)!="y" & colnames(trainData) %in% labels(terms(formula))] - model <- xgboost::xgboost(data = as.matrix(trainData[,reg_vars]),nrounds = nrounds,nthread=1, + options(datatable.verbose=TRUE) + model <- xgboost::xgboost(data = as.matrix(trainData[,reg_vars]),nrounds = nrounds,nthread=1,verbose=0, label = trainData$y, metrics = list("rmse"), objective = "reg:squarederror",...) @@ -231,7 +232,7 @@ reg_vars <- colnames(trainData)[colnames(trainData)!="y" & colnames(trainData) %in% labels(terms(formula))] - model <- BART::wbart(x.train = trainData[,reg_vars],y.train = trainData$y,sparse = T,nkeeptreedraws = 100,ndpost = 100,nskip=100) + model <- BART::wbart(x.train = trainData[,reg_vars],y.train = trainData$y,sparse = T,nkeeptreedraws = 100,ndpost = 500,nskip=100) return(list(model=model)) } diff --git a/R/predictiveAnalytics.R b/R/predictiveAnalytics.R index aeb1bfd..9f65dfb 100644 --- a/R/predictiveAnalytics.R +++ b/R/predictiveAnalytics.R @@ -197,7 +197,9 @@ quantInvVec <- function(distrMatrix,value) apply(distrMatrix, 1, quantInv,value) "time", "covariates", "factors", - "trainingIndicator" + "trainingIndicator", + "featEngLags", + "featEngAutoTimeBased" )) } @@ -208,7 +210,7 @@ quantInvVec <- function(distrMatrix,value) apply(distrMatrix, 1, quantInv,value) "manualBoundMean", "manualBoundErrorBound", "manualUpperBound", - "manualUpperLower", + "manualLowerBound", "sigmaBound", "controlPeriodCheck", "controlPeriodStart", @@ -811,7 +813,7 @@ lagit <- function(a,k) { if(!ready || !is.null(jaspResults[["predanResults"]][["featureEngState"]])) return() featureEngState <- createJaspState() - featureEngState$dependOn(c("featEngLags","featEngAutoTimeBased","covariates","factors","dependent")) + featureEngState$dependOn(c("featEngLags","featEngAutoTimeBased","featEngImputeTS","covariates","factors","dependent")) #featEngData <- data.frame(y = dataset[,options[["dependent"]]], time = as.POSIXct( dataset[,options[["time"]]])) if (options$trainingIndicator != ""){ @@ -840,6 +842,10 @@ lagit <- function(a,k) { } + + if(options$featEngImputeTS) + featEngData$y <- imputeTS::na_interpolation(featEngData$y) + ##TODO: add if(options$featEngLags > 0) featEngData <- cbind(featEngData,as.data.frame(lagit(featEngData$y,k = 1:options$featEngLags))) @@ -849,6 +855,9 @@ lagit <- function(a,k) { + + + #stop(gettext(paste0(colnames(featEngData)))) #colnames(featEngData) <- decodeColNames(colnames(featEngData)) @@ -882,6 +891,7 @@ lagit <- function(a,k) { initial = options$resampleInitialTraining, assess = options$resampleForecastHorizon, cumulative = options$resampleCumulativeCheck, + lag = options$featEngLags, skip = options$resampleSkip, max_slice = options$resampleMaxSlice, from = options$"resampleSliceStart") @@ -918,27 +928,22 @@ lagit <- function(a,k) { print(paste0("models:",sapply(modelList,"[","model"))) - - + # TODO: specify which model is running + startProgressbar( + length(modelList), + gettextf("Running models") + ) for (i in 1:length(modelList)) { - startProgressbar( - length(modelList), - gettextf( - paste0("Running model ", i, " / ", - length(modelList)," :",options$selectedModels[[i]])) - ) - - cvResults[[i]] <- .crossValidationHelperSlices(model = modelList[[i]]$model, formula = modelList[[i]]$modelFormula, data = dataEng, cvPlan = jaspResults[["predanResults"]][["cvPlanState"]]$object, - parallel = options$parallelComputation,preProList = T,keepModels = "summary",keepMetrics = "fully") - + preProList = T,keepModels = "summary",keepMetrics = "fully") + progressbarTick() cvResults[[i]]$modelName <- options$selectedModels[[i]] } @@ -1092,7 +1097,8 @@ lagit <- function(a,k) { # #} - if(!is.null(preProList)){ + # only perform preprocessing if predictors present apart from ~ time + if(sum(!grepl("y|time",colnames(trainData))) > 0){ preProSpec <- preProcess.default(trainData[,!grepl("y",colnames(trainData))],verbose = F,method = c("center", "scale","zv")) #identify factors with too @@ -1161,7 +1167,6 @@ lagit <- function(a,k) { keepMetrics = c("fully", "summary","none"), metrics = c("crps","dss","log","coverage","bias", "pit","mae","rmse","rsq"), model_args=list(), - parallel = T, ...) { @@ -1170,25 +1175,16 @@ lagit <- function(a,k) { cvResList <- list() cvModelObject <- list() - if(model == "xgboost" | !parallel){ - future::plan(future::sequential) - } else{ - ifelse(Sys.info()["sysname"] == "Windows", - future::plan(future::multisession,workers = 5), - future::plan(future::multisession,workers = 5)) - } - cvModelObject <- future.apply::future_lapply(X = 1:length(cvPlan),function(i){ + cvModelObject <- lapply(X = 1:length(cvPlan),function(i){ system(sprintf('echo "\n%s\n"', paste0("fitting slice " , i, " of ",model))) - .predAnModelFit(trainData = data[as.character(cvPlan[[i]]$analysis),], - testData = data[as.character(cvPlan[[i]]$assessment),], - predictFuture = T, - method = model, - formula = formula, - model_args =model_args,... - ) + testData = data[as.character(cvPlan[[i]]$assessment),], + predictFuture = T, + method = model, + formula = formula, + model_args =model_args,... + ) }) - future::plan(future::sequential) l <- lapply(cvModelObject, function(x) x$pred$dist) # time,draw,slice array @@ -1280,8 +1276,13 @@ lagit <- function(a,k) { if(!ready || is.null(jaspResults[["predanResults"]][["cvResultsState"]])) return() metricSummaryTable <- createJaspTable("Forecast Evaluation Metric Table") - metricSummaryTable$dependOn(c("checkPerformBma","bmaTestPeriod","bmaTestProp")) + metricSummaryTable$dependOn(c("checkPerformBma", + "bmaTestPeriod", + 'fromR', + "bmaTestProp")) scoreSummary <- as.data.frame(t(sapply(jaspResults[["predanResults"]][["cvResultsState"]]$object, function(x) colMeans(x$scoringSummary)))) + bmaRes <- jaspResults[["predanResults"]][["bmaResState"]]$object + metricSummaryTable$addColumnInfo(name= "model", title = "", type = "string") if(options$metricCrps) metricSummaryTable$addColumnInfo(name = "crps" , title = "CRPS" ,type = "number") @@ -1306,23 +1307,26 @@ lagit <- function(a,k) { metricSummaryTable[["rmse"]] <- scoreSummary$"rmse" metricSummaryTable[["r2"]] <- scoreSummary$"rsq" - if(options$"checkPerformBma" && !is.null(jaspResults[["predanResults"]][["bmaResState"]])){ + if(options$"checkPerformBma" && !is.null(bmaRes)){ bmaRes <- jaspResults[["predanResults"]][["bmaResState"]]$object scoreSum <- rowMeans(bmaRes$scores,na.rm = T) - metricSummaryTable$addRows(list( - "model" = "BMA", - "crps" = scoreSum["crps"], - "dss" = scoreSum["dss"], - "log" = scoreSum["log"], - "coverage" =scoreSum["coverage"], - "bias" =scoreSum["bias"], - "pit" = scoreSum["pit"], - "mae" =scoreSum["mae"], - "rmse" =scoreSum["rmse"], - "r2" =scoreSum["rsq"] - )) + + scoreTableList <- list() + scoreTableList['model'] <- 'BMA' + if(options$metricCrps) scoreTableList["crps"] <- scoreSum["crps"] + if(options$metricDss) scoreTableList["dss"] <- scoreSum["dss"] + if(options$metricLog) scoreTableList["log"] <- scoreSum["log"] + if(options$metricCoverage) scoreTableList["coverage"]<- scoreSum["coverage"] + if(options$metricBias) scoreTableList["bias"] <- scoreSum["bias"] + if(options$metricPit) scoreTableList["pit"] <- scoreSum["pit"] + if(options$metricMae) scoreTableList["mae"] <- scoreSum["mae"] + if(options$metricRmse) scoreTableList["rmse"] <- scoreSum["rmse"] + if(options$metricR2) scoreTableList["r2"] <- scoreSum["rsq"] + + + metricSummaryTable$addRows(scoreTableList) } @@ -1410,27 +1414,35 @@ lagit <- function(a,k) { dataEng <- jaspResults[["predanResults"]][["featureEngState"]]$object cvPlan <- jaspResults[["predanResults"]][["cvPlanState"]]$object + predanResults <-jaspResults[["predanResults"]][["predanBounds"]][["object"]] + upperLimit <- predanResults[["upperLimit"]] + lowerLimit <- predanResults[["lowerLimit"]] + plotLimit <- predanResults[["plotLimit"]] + + #maxSlices <- options$modelsToPlotSlices + + mods <- names(cvRes) modsFull <- sapply(cvRes, "[","modelName") - plotMods <- mods[which(modsFull %in% options$"modelsToPlot")] - slices <- dimnames(cvRes[[1]]$realMatrix)[[2]] + plotMods <- c(mods[which(modsFull %in% options$"modelsToPlot")],"Data") + slices <- head(dimnames(cvRes[[1]]$realMatrix)[[2]],options$modelsToPlotSlices) cvResPlot <- createJaspPlot(title = "Prediction Plots",width = 720,height = 180*length(slices)) - cvResPlot$dependOn(c("modelsToPlot","checkPerformBma")) + cvResPlot$dependOn(c("modelsToPlot","checkPerformBma","modelsToPlotSlices")) mods <- names(cvRes) modsFull <- sapply(cvRes, "[","modelName") - print(plotMods) - print(slices) + ##TODO choice for equal or unequal t diff spread_equal <- T t_var <- ifelse(spread_equal,"tt",time) sumPred <- lapply(cvRes,function(x) x$predSummary) - dataPlot <- lapply(cvPlan, function(x) data.frame( tt = c(x$analysis,x$assessment), + dataPlot <- lapply(cvPlan, + function(x) data.frame( tt = c(x$analysis,x$assessment), type = rep(c("Analysis","Assessment"), c(length(x$analysis),length(x$assessment))))) @@ -1439,30 +1451,28 @@ lagit <- function(a,k) { dataPlot <- dplyr::bind_rows(.id = "slice",dataPlot) realData <- as.data.frame.table(realMatrix) - dataPlot$real <- NA - dataPlot$real[dataPlot$type == "Assessment"] <- realData$Freq - dataPlot$real[dataPlot$type == "Analysis"] <- dataEng$y[dataPlot$tt[dataPlot$type == "Analysis"]] + dataPlot$value <- NA + dataPlot$value[dataPlot$type == "Assessment"] <- realData$Freq + dataPlot$value[dataPlot$type == "Analysis"] <- dataEng$y[dataPlot$tt[dataPlot$type == "Analysis"]] dataPlot$time <- dataEng$time[dataPlot$tt] predSummArray <- sapply(cvRes,FUN = function(x) x$predSummary,simplify = "array",USE.NAMES = T) - dimnames(predSummArray)[3] <- list(dimnames(realMatrix)[[2]]) + dimnames(predSummArray)[3] <- list(dimnames(realMatrix)[[2]]) - pred <- cbind(as.data.frame.table(predSummArray[,1,,],responseName = "pred"), - upr = as.data.frame.table(predSummArray[,2,,])$Freq, - lwr = as.data.frame.table(predSummArray[,3,,])$Freq) - - #if(length(mods)==1) - # pred <- cbind(pred,model = mods)[] + pred <- cbind(as.data.frame.table(predSummArray[,1,,],responseName = "value"), + upr = as.data.frame.table(predSummArray[,2,,])$Freq, + lwr = as.data.frame.table(predSummArray[,3,,])$Freq) - colnames(pred)[1:3] <- c("tt","slice","model") - pred$tt <- dataPlot$tt[dataPlot$type == "Assessment"] + colnames(pred)[1:3] <- c("tt","slice","type") + pred$tt <- as.numeric(dataPlot$tt[dataPlot$type == "Assessment"]) + pred$time <- dataPlot$time[dataPlot$type == "Assessment"] - dataPlot <- dplyr::left_join(dataPlot,pred) dataPlot$type <- "Data" + dataPlot <- dplyr::bind_rows(dataPlot,pred) #BMA @@ -1480,33 +1490,49 @@ lagit <- function(a,k) { ttBma <- unlist(lapply(cvPlan,function(x) tail(x$assessment,nrow(bmaPred)/length(bmaSlices)))) - bmaData <- subset(dataPlot,model == plotMods[1] & slice %in% bmaSlices & tt %in% ttBma) - bmaData$pred <- bmaPred$Freq + bmaData <- subset(dataPlot,type == plotMods[1] & slice %in% bmaSlices & tt %in% ttBma) + bmaData$value <- bmaPred$Freq bmaData$slice <- rep(bmaSlices,each = nrow(bmaPred)/length(bmaSlices)) bmaData[,c("upr","lwr")] <- NA - bmaData$model <- "BMA" + bmaData$type <- "BMA" #View(bmaData) - dataPlot <- rbind(dataPlot,bmaData) + dataPlot <- dplyr::bind_rows(dataPlot,bmaData) plotMods <- c(plotMods,"BMA") } #View(dataPlot) - dataPlot <- subset(dataPlot,slice %in% slices & (model %in% plotMods | is.na(model))) + dataPlot <- subset(dataPlot,slice %in% slices & (type %in% plotMods | is.na(type))) xBreaks <- pretty(dataPlot[[t_var]]) - yBreaks <- pretty(dataPlot$real) + yBreaks <- pretty(dataPlot$value) + + #reorder so Data is first factor + dataPlot$type <- factor(dataPlot$type,ordered = T, + levels = c("Data",unique(dataPlot$type)[!grepl("Data",unique(dataPlot$type))])) - #dataPlot$type <- as.factor(dataPlot$type) - #dataPlot$type <- relevel(dataPlot$type,"Data") + #order slices properly so plot shows correctl + slicesLevels <- unique(dataPlot$slice) + slicesLevels <- slicesLevels[order(nchar(slicesLevels))] + dataPlot$slice <- factor(dataPlot$slice,levels = slicesLevels) - p <- ggplot2::ggplot(dataPlot,ggplot2::aes_string(t_var,"real",color = "type")) + ggplot2::geom_line() + - ggplot2::geom_line(ggplot2::aes(tt,pred,color=model)) + ggplot2::facet_wrap(facets = "slice",ncol = 1) + - ggplot2::coord_cartesian(ylim = range(yBreaks)) + + #slicesInclude <- ifelse(options$resampleSliceStart == 'head',head(slicesLevels,maxSlices),tail(slicesLevels,maxSlices)) + #dataPlot <- dataPlot[dataPlot$slice %in% slicesInclude,] + + p <- ggplot2::ggplot(dataPlot,ggplot2::aes_string(t_var,"value",color = "type")) + ggplot2::geom_line() + + ggplot2::labs(color = "Type") + + ggplot2::coord_cartesian(ylim=c(plotLimit[[2]], + plotLimit[[1]])) + + ggplot2::facet_wrap(facets = "slice",ncol = 1) + + #ggplot2::coord_cartesian(ylim = range(yBreaks)) + ggplot2::theme(plot.margin = ggplot2::margin(t = 3, r = 12, b = 0, l = 1)) + ggplot2::theme(panel.grid = ggplot2::theme_bw()$panel.grid, panel.background = ggplot2::element_rect(fill = "white"), legend.position = "bottom",legend.title = ) + jaspGraphs::scale_JASPcolor_discrete("viridis") + - ggplot2::labs(color = "Type") + ggplot2::ylab('Value') + ggplot2::xlab('Time') + + ggplot2::geom_hline(na.rm = T,yintercept = upperLimit,linetype="dashed",color="darkred") + + ggplot2::geom_hline(yintercept = lowerLimit,linetype="dashed",color="darkred") + + cvResPlot$plotObject <- p jaspResults[["predanMainContainer"]][["cvContainer"]][["cvResPlot"]] <- cvResPlot @@ -1519,7 +1545,7 @@ lagit <- function(a,k) { realArray, methodBMA = c("EM","gibbs"), testMethod = c("next","in"), - inPercent = 0.3,retrain = T,parallel = T){ + inPercent = 0.3,retrain = T){ testMethod <- match.arg(testMethod) if(testMethod == "in"){ @@ -1533,16 +1559,8 @@ lagit <- function(a,k) { #predBmaArray <- resList <- list() - - if(!parallel){ - future::plan(future::sequential) - } else{ - ifelse(Sys.info()["sysname"] == "Windows", - future::plan(future::multisession,workers = 5), - future::plan(future::multicore,workers = 5)) - } - - resList <- future.apply::future_lapply(X = 1:dim(realArray)[2],FUN = function(i){ + startProgressbar(dim(realArray)[2],'Running BMA') + resList <- lapply(X = 1:dim(realArray)[2],FUN = function(i){ iTest <- i + nSlice if(i != dim(realArray)[2] | testMethod == "in"){ @@ -1556,10 +1574,9 @@ lagit <- function(a,k) { .outcomeCalibration = realArray[nTrain,i,1], .modelNames = dimnames(realArray)[[3]]) } - + progressbarTick() bmaRes <- EBMAforecast::calibrateEnsemble(bmaData,model = "normal",method = methodBMA,tol = 0.05,useModelParams =F) }) - future::plan(future::sequential) dimsMetric <- ifelse(testMethod == "next", length(resList)-1,length(resList)) @@ -1588,7 +1605,7 @@ lagit <- function(a,k) { bmaResState <- createJaspState() bmaResState$dependOn(c(.modelDependencies(), - .bmaResultsDependencies())) + .bmaResultsDependencies(),"modelsToPlot","checkPerformBma")) cvRes <- jaspResults[["predanResults"]][["cvResultsState"]]$object @@ -1609,18 +1626,17 @@ lagit <- function(a,k) { bmaRes <- .ebmaHelper(predSumArray = predSumArray, realArray = realArray, methodBMA = bmaMethod, - testMethod = bmaTestMethod,inPercent = options$bmaTestProp, - parallel = F) + testMethod = bmaTestMethod,inPercent = options$bmaTestProp) bmaResState$object <- bmaRes - .predanMetricTable(jaspResults = jaspResults,options = options,ready = ready) + #.predanMetricTable(jaspResults = jaspResults,options = options,ready = ready) jaspResults[["predanResults"]][["bmaResState"]] <- bmaResState jaspResults[["plottableModelsQml"]] <- createJaspQmlSource(sourceID="plottableModelsQml", value= c(options$selectedModels,"BMA")) - if("BMA" %in% options$"modelsToPlot") - .predanForecastVerificationResultPlot(jaspResults,options,ready) + #if("BMA" %in% options$"modelsToPlot") + # .predanForecastVerificationResultPlot(jaspResults,options,ready) } return() @@ -1635,7 +1651,7 @@ lagit <- function(a,k) { bmaRes <- jaspResults[["predanResults"]][["bmaResState"]]$object bmaWeightsTable <- createJaspTable(title = "BMA - Model Weights") - bmaWeightsTable$dependOn(c("bmaWeightsTable","bmaWeightsTablePerSlice")) + bmaWeightsTable$dependOn(c("bmaWeightsTable","bmaWeightsTablePerSlice","modelsToPlot","checkPerformBma")) weightMatrix <- bmaRes$weightMatrix bmaWeightsTable$addColumnInfo(name="model", title="Model", type="string") if(options$"bmaWeightsTablePerSlice") { @@ -1670,7 +1686,7 @@ lagit <- function(a,k) { -###### future predictions +## future predictions #### helper functions @@ -1700,8 +1716,9 @@ lagit <- function(a,k) { if(!is.null(bmaRes)){ - - bmaRes <- bmaRes$res[[length(bmaRes)]] + # select most recent bma result + #bmaRes <- bmaRes$res[[length(bmaRes)]] + bmaRes <- tail(bmaRes$res,1) #apply model weighst and optional bias adjustment to credible interval and mean prediction for(i in 1:5){ @@ -1736,23 +1753,10 @@ lagit <- function(a,k) { return(predictionsCombined) } -.getTimeSinceEvent <- function(var,time,output=c("time","event")){ - output <- match.arg(output) - events <- which(var == 1) - start <- events - end <- c(events[-1]-1,length(var)) - seqs <- mapply(seq,start,end) - if(output == "time") - difs <- c(rep(0,start[1]-1),unlist(sapply(seqs, function(x) difftime(time[x],time[x[1]])))) - else - difs <- c(rep(0,start[1]-1),unlist(sapply(seqs, function(x) x - x[1]))) - return(difs) -} - .predanFuturePredictionResults <- function(jaspResults,dataset,options,ready){ - if(!ready || is.null(jaspResults[["predanResults"]][["cvResultsState"]]) || options$"futurePredictionPoints" == 0 ) return() + if(!ready || is.null(jaspResults[["predanResults"]][["cvResultsState"]]) || !(options$selectedFuturePredictionModel > 0) ) return() if(is.null(jaspResults[["predanResults"]][["futurePredState"]]) && (options$"futurePredictionPoints" > 0 || @@ -1824,7 +1828,7 @@ lagit <- function(a,k) { } .predanFuturePredictionPlot <- function(jaspResults,dataset,options,ready){ - if(!ready || is.null(jaspResults[["predanResults"]][["futurePredState"]])) return() + if(!ready || is.null(jaspResults[["predanResults"]][["futurePredState"]]) || !(options$selectedFuturePredictionModel > 0)) return() if(is.null(jaspResults[["predanMainContainer"]][["predanFuturePredContainer"]][["futurePredPlot"]]) && options$"checkFuturePredictionPlot"){ diff --git a/inst/Description.qml b/inst/Description.qml index b85a600..fc21f80 100644 --- a/inst/Description.qml +++ b/inst/Description.qml @@ -20,10 +20,10 @@ Description qml: 'predictiveAnalytics.qml' } - Analysis - { - title: "Multivariate Binomial Control" - func: "multiVarControl" - qml: 'multiVarControl.qml' - } + //Analysis + //{ + // title: "Multivariate Binomial Control" + // func: "multiVarControl" + // qml: 'multiVarControl.qml' + //} } diff --git a/inst/qml/predictiveAnalytics.qml b/inst/qml/predictiveAnalytics.qml index 02631dd..710059a 100644 --- a/inst/qml/predictiveAnalytics.qml +++ b/inst/qml/predictiveAnalytics.qml @@ -1,7 +1,7 @@ import QtQuick -import QtQuick.Layouts -import JASP.Controls -import JASP.Widgets +import QtQuick.Layouts +import JASP.Controls +import JASP.Widgets Form { @@ -29,7 +29,7 @@ Form info: qsTr("Time variable that each corresponds to the time stamp of each observation. Can be in the following formats: ['YYYY-MM-DD', 'YYYY/MM/DD', 'YYYY-MM-DD HH:MM:SS', 'YYYY/MM/DD HH:MM:SS'] (needed)") } - AssignedVariablesList + AssignedVariablesList { name: "covariates" title: qsTr("Covariates") @@ -44,7 +44,7 @@ Form title: qsTr("Factors") allowedColumns: ["ordinal", "nominal", "nominalText"] } - + AssignedVariablesList { name: "trainingIndicator" @@ -212,7 +212,7 @@ Form checked: false label: "Reporting mode" CIField{name: "controlPlotReportingPercent"; label: "Out-of-bound percent threshold";defaultValue:5} - + } } } @@ -295,12 +295,14 @@ Form CheckBox{name: "featEngAutoTimeBased"; label: "Automatic time-based features"} - //CheckBox{ - // name: "featEngAggregateTime" - // label: "Aggregate data every" - // childrenOnSameRow: true - // IntegerField{name: "featEngAggWindow"; afterLabel: qsTr("minutes"); defaultValue: 2; min:2} - //} + + + CheckBox + { + name: "featEngImputeTS" + label: qsTr("Impute missing values") + + } Group { @@ -326,8 +328,18 @@ Form { title: qsTr("Evaluation Plan") //Layout.columnSpan: 1 - IntegerField{name: "resampleInitialTraining"; label: qsTr("Training window"); defaultValue: resampleForecastHorizon.value*2} - IntegerField{name: "resampleForecastHorizon"; id: "resampleForecastHorizon"; label: qsTr("Prediction window");defaultValue: 100} + IntegerField{ + name: "resampleForecastHorizon" + id: "resampleForecastHorizon" + label: qsTr("Prediction window") + defaultValue: Math.floor((dataSetModel.rowCount() / 5)*0.6) + } + IntegerField{ + name: "resampleInitialTraining" + label: qsTr("Training window") + defaultValue: Math.floor((dataSetModel.rowCount() / 5)*1.4) + } + IntegerField{name: "resampleSkip"; label: qsTr("Skip between training slices");defaultValue: resampleForecastHorizon.value} RadioButtonGroup { @@ -337,7 +349,7 @@ Form RadioButton{ value: "head"; label: qsTr("Start")} RadioButton{ value: "tail"; label: qsTr("End"); checked: true} } - IntegerField{name: "resampleMaxSlice"; id: "maxSlices"; label: qsTr("Maximum nr. of slices");defaultValue:5} + IntegerField{name: "resampleMaxSlice"; id: "maxSlices"; label: qsTr("Maximum nr. of slices"); defaultValue:5; min: 1} CheckBox{name: "resampleCumulativeCheck"; label: qsTr("Cumulative training")} CheckBox @@ -345,7 +357,7 @@ Form name: "resampleCheckShowTrainingPlan" label: qsTr("Show evaluation plan") CheckBox{ name: "resamplePlanPlotEqualDistance"; label: qsTr("Spread points equally"); checked: true} - IntegerField{name: "resamplePlanPlotMaxPlots"; label: "Max slices shown:"; defaultValue: 5; max: maxSlices.value ;min:1} + IntegerField{name: "resamplePlanPlotMaxPlots"; label: "Max slices shown:"; defaultValue: maxSlices.value ; max: maxSlices.value ;min:1} } } } @@ -367,23 +379,24 @@ Form { name: "modelSelection" width: preferencesModel.uiScale * 300 - source: [{values: [ {label : qsTr("linear regression - y ~ time"), value: "lmSpike"}, + source: [{values: [ + {label : qsTr("linear regression - y ~ time"), value: "lmSpike"}, {label : qsTr("linear regression - regression"), value: "lmSpikeReg"}, {label : qsTr("linear regression - regression + lag"), value: "lmSpikeRegLag"}, {label : qsTr("bsts - linear trend model"), value: "bstsLinear"}, {label : qsTr("bsts - linear trend model - regression"), value: "bstsLinearReg"}, - {label : qsTr("bsts - linear trend model - regression + lag"), value: "bstsLinearLag"}, + //{label : qsTr("bsts - linear trend model - regression + lag"), value: "bstsLinearLag"}, {label : qsTr("bsts - autoregressive model"), value: "bstsAr"}, {label : qsTr("bsts - autoregressive model - regression"), value: "bstsArReg"}, - {label : qsTr("bsts - autoregressive model - regression + lag"), value: "bstsArRegLag"}, + //{label : qsTr("bsts - autoregressive model - regression + lag"), value: "bstsArRegLag"}, {label : qsTr("prophet"), value: "prophet"}, {label : qsTr("prophet - regression"), value: "prophetReg"}, - {label : qsTr("prophet - regression + lag"), value: "prophetRegLag"}, - {label : qsTr("xgboost - regression"), value: "xgboostReg"}, - {label : qsTr("xgboost - regression + lag"), value: "xgboostRegLag"}, + //{label : qsTr("prophet - regression + lag"), value: "prophetRegLag"}, + //{label : qsTr("xgboost - regression"), value: "xgboostReg"}, + //{label : qsTr("xgboost - regression + lag"), value: "xgboostRegLag"}, {label : qsTr("bart - regression"), value: "bartReg" }, - {label : qsTr("bart - regression + lag"), value: "bartRegLag"}, - {label : qsTr("bart - stack"), value: "bartStackReg"} + {label : qsTr("bart - regression + lag"), value: "bartRegLag"} + //{label : qsTr("bart - stack"), value: "bartStackReg"} @@ -423,11 +436,11 @@ Form CheckBox{ name: "metricBias"; label: qsTr("Bias"); checked: true} CheckBox{ name: "metricPit"; label: qsTr("Probability integral transform"); checked: true} } - - - - + + + + Group { title: qsTr("Deterministic") @@ -464,7 +477,7 @@ Form } - + } @@ -494,6 +507,7 @@ Form } } //CheckBox{name: "modelsToPlotCredibleInterval"; label: qsTr("Show credible interval")} + IntegerField{name: "modelsToPlotSlices"; label: "Max slices shown:"; defaultValue: maxSlices.value ; max: maxSlices.value ;min:1} } } @@ -505,7 +519,7 @@ Form CheckBox { name: "checkPerformBma" - label: "Perform BMA" + label: "Perform eBMA" id: doBMA //checked: true @@ -519,6 +533,7 @@ Form RadioButtonGroup { name: "bmaTestPeriod" + visible: false title: "Evaluation Method" RadioButton{ value: "bmaTestNextSlice"; label: qsTr("Next test slice"); checked: true} RadioButton @@ -592,7 +607,7 @@ Form // name: "timepoints" // label: qsTr("Time points") // childrenOnSameRow: true - IntegerField{name: "futurePredictionPoints"; afterLabel: qsTr("data points");min: 0;defaultValue: 0} + IntegerField{name: "futurePredictionPoints"; afterLabel: qsTr("data points");min: 1; defaultValue: resampleForecastHorizon.value } // checked: true //} @@ -604,7 +619,7 @@ Form // IntegerField{name: "futurePredictionDays"; min: 0; defaultValue: 0} // //} - + } RadioButtonGroup @@ -618,29 +633,29 @@ Form checked: true label: qsTr("Last") childrenOnSameRow: true - IntegerField{name: "futurePredTrainingPoints"; afterLabel: qsTr("data points"); defaultValue: 200} + IntegerField{name: "futurePredTrainingPoints"; afterLabel: qsTr("data points"); defaultValue: resampleInitialTraining.value} } RadioButton{name: "all"; label: qsTr("All data points")} } } - Group + Group { - + CheckBox { name: "checkFuturePredictionPlot" label: "Future prediction plot" - checked: false + checked: true CheckBox { name: "futurePredSpreadPointsEqually" label: qsTr("Spread points equally") checked: true } - + } CheckBox { @@ -649,25 +664,25 @@ Form checked: false enabled: preferencesModel.reportingMode CIField{name: "futurePredThreshold"; label: "Out-of-bound probability threshold"} - + } } } - Section - { - title: qsTr("Advanced Options") + //Section + //{ + //title: qsTr("Advanced Options") - CheckBox{name: 'parallelComputation'; label: 'Parallel model computation';checked: true} + //CheckBox{name: 'parallelComputation'; label: 'Parallel model computation';checked: true} - IntegerField{name: "resampleSkip"; label: qsTr("Skip between training slices");defaultValue: resampleForecastHorizon.value} - } + + //} From 2be95ff6c78259d7bf160ba718994be45fbba495 Mon Sep 17 00:00:00 2001 From: boutinb Date: Tue, 19 Sep 2023 16:42:44 +0200 Subject: [PATCH 07/11] Update version to 0.18.1 --- DESCRIPTION | 2 +- inst/Description.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 24d08da..4226104 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: jaspPredictiveAnalytics Type: Package Title: A module for JASP -Version: 0.18.0 +Version: 0.18.1 Date: 2020-10-15 Author: JASP Team Website: jasp-stats.org diff --git a/inst/Description.qml b/inst/Description.qml index fc21f80..b568eea 100644 --- a/inst/Description.qml +++ b/inst/Description.qml @@ -6,7 +6,7 @@ Description name : "jaspPredictiveAnalytics" title : qsTr("Predictive Analytics") description : qsTr("This module offers predictive analytics.") - version : "0.18.0" + version : "0.18.1" author : "JASP Team" maintainer : "JASP Team " website : "https://jasp-stats.org" From 5bfa066054c8d7df6ca72cc833df5f15a697cd47 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 23 Sep 2023 02:42:12 +0000 Subject: [PATCH 08/11] updated translation files --- .../LC_MESSAGES/R-jaspPredictiveAnalytics.mo | Bin 1907 -> 1843 bytes .../LC_MESSAGES/R-jaspPredictiveAnalytics.mo | Bin 3659 -> 3589 bytes .../LC_MESSAGES/R-jaspPredictiveAnalytics.mo | Bin 4035 -> 3915 bytes po/QML-eo.po | 28 +--------- po/QML-fr.po | 28 +--------- po/QML-id.po | 28 +--------- po/QML-ja.po | 28 +--------- po/QML-jaspPredictiveAnalytics.pot | 28 +--------- po/QML-nl.po | 28 +--------- po/QML-pl.po | 28 +--------- po/QML-pt.po | 28 +--------- po/QML-ru.po | 28 +--------- po/QML-tr.po | 28 +--------- po/QML-zh_Hant.po | 28 +--------- po/R-de.po | 51 ++++++++++++----- po/R-es.po | 52 +++++++++++++----- po/R-jaspPredictiveAnalytics.pot | 12 +--- 17 files changed, 98 insertions(+), 325 deletions(-) diff --git a/inst/po/de/LC_MESSAGES/R-jaspPredictiveAnalytics.mo b/inst/po/de/LC_MESSAGES/R-jaspPredictiveAnalytics.mo index c779641e04356e6e27b5def7c6723bbc24a708a4..21af89225a530ecc22520641e0d8670ad0c279f5 100644 GIT binary patch delta 406 zcmX}oF-yZh6u|MEY*v2`&vDpG2sekCQ#CsOSxW*8_aEm*< z!q1k-8UCUk;NR3*Xzdz9wAo)GCVGH@c@d)?V1(>n2WP08((4$fW~OV|TU=9Lp#Dw0 iwf>27Qu}-4A!yBwpKjv9x5j1FNbTa)xho%>z}f@jQXUlm delta 466 zcmYk(u}i~16vy#jn#O9Yv2Ab=tV5+ZN!7(71sw&Kf&~YMfH+ujbP$AwuAMAJaCPsX z1o5x%Ul9Bo+?@Qr>kU5g?sM-h;a-wF{)w}%dhtm_o!lU2WP|Jm48$wi^v#=NpZeWf zE=ZfyDb{d^FZhUSxF1R}o?r>jv54us&UEEBZjnoO3_PoQjPL;$afHttI!4eIn`R3K zxQ*91!6yD6S^ql4wjTj9lvnw7Nk?}8FH2`&>Bkp`XyRJH)sv~4|`L4 z#$uJUFT!mu=tuP6Vwtf@t{lv3cYvR|Ut#klvO?PDvamy~bG3Ci{S1!sk6{JF IycyLBe+e=m5dZ)H diff --git a/inst/po/en@quot/LC_MESSAGES/R-jaspPredictiveAnalytics.mo b/inst/po/en@quot/LC_MESSAGES/R-jaspPredictiveAnalytics.mo index 0aaca67b95599249bd1812b96ace39ac149840f7..784484579060ead70230058c124a012d80610c25 100644 GIT binary patch delta 580 zcmY+>yGz4R6vy$CG#ah-RUe?#5`+#8f^DVXD`Q7pTpjG-;7~;o7fT(iptwlr)Jep@ zpi^C4gbL~)2x6fwf|KqleovCc3#XslOXaTo!reLKA=B75<oqIk;L*4&Yw^NzlQTdZxDDBHE=f@W;*n9 z>fbU<^;7yaIIJIzcV&p8_rIZybm)ONsBmaM1o+`Oo598w>pAwdk@jBfvFO}%ChN>(=4UhBul?wqnr^tR7^$Df(uTkI4S=hL^Ae)xkH!f!hsxNP@1^KpJXoKsAu{>jqQ<*N{hU7=r9C44g7@bACcRv6SS@)sleB2H&_4p5w;5zOA diff --git a/inst/po/es/LC_MESSAGES/R-jaspPredictiveAnalytics.mo b/inst/po/es/LC_MESSAGES/R-jaspPredictiveAnalytics.mo index 3d06253a02f6d4aa073aebc8771154010e39be83..2108261c3313abe7cacd9f9f51ce5b6994d95e81 100644 GIT binary patch delta 511 zcmY+=zb`{k7{>9Z*R88XTlFImR7zvQXpy*yL3i;75C(&Zn7bH=u?!N4b}}@vTr36& z24N9n2hqeoAhDR*?|X6$PICG==e@V*eeQXjd@WQy^8Tq9!_0B!6LW&Oli-K(iEG%3 zUGSt8*2lPr?_E-X=b5B5fOD9~5bL;#cJ>cuFx@Q$IEubhQ86ye-~kWj<9&pjtvjTb z?vXR}fcyB2J-EbaX9OwZI{OyIZCp-CThtr4fw^93milg=G=vv8Mt@zi_@eNJCA{gE zMzD#N^c$`5Z@h2g3HyN0N#i+M&`Y$S4YdDV;UV54y%lC9a=2Rn7e2Si!d|vv*JoEX z$mCsjC?Dz4($ifl8UGCn_BSjHAL~L`jq7!dt4CfK?RhmnDh5+tR8GAltJB$92k`|j A5C8xG delta 628 zcmXxhIZpyn5Ww+aIXwUu&xk<@NMVdejK*kVVo+;iVyB`IkH~K0TG$Ycg|S5o6ANjK z+EUorSn>rdj9Bm%CQ^|dk}zMCk>85r)fae8edX0* z4*99$7{y-XPDvxrlq@Jr{jmyt({5pVs0DC%TPG`L?fB>I3H-ry9{ zgS?}5uAy~12E9bbs;^B$C!x*gXtil~La38qfNp3L8ahR7RAW&)p+PsaiFWjmaK9T2 z$PIlx3`JyGmg>L0W+1xhSk|$1I99fcrPKOHC}a5Dy+|Wy=1)oo&RM}K+O2K7`WCDG E1OJsa-T(jq diff --git a/po/QML-eo.po b/po/QML-eo.po index 2678cff..aa8dfd9 100644 --- a/po/QML-eo.po +++ b/po/QML-eo.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-fr.po b/po/QML-fr.po index 2678cff..aa8dfd9 100644 --- a/po/QML-fr.po +++ b/po/QML-fr.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-id.po b/po/QML-id.po index 2678cff..aa8dfd9 100644 --- a/po/QML-id.po +++ b/po/QML-id.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-ja.po b/po/QML-ja.po index 2678cff..aa8dfd9 100644 --- a/po/QML-ja.po +++ b/po/QML-ja.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-jaspPredictiveAnalytics.pot b/po/QML-jaspPredictiveAnalytics.pot index 2678cff..aa8dfd9 100644 --- a/po/QML-jaspPredictiveAnalytics.pot +++ b/po/QML-jaspPredictiveAnalytics.pot @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-nl.po b/po/QML-nl.po index 2678cff..aa8dfd9 100644 --- a/po/QML-nl.po +++ b/po/QML-nl.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-pl.po b/po/QML-pl.po index 2678cff..aa8dfd9 100644 --- a/po/QML-pl.po +++ b/po/QML-pl.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-pt.po b/po/QML-pt.po index 2678cff..aa8dfd9 100644 --- a/po/QML-pt.po +++ b/po/QML-pt.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-ru.po b/po/QML-ru.po index 2678cff..aa8dfd9 100644 --- a/po/QML-ru.po +++ b/po/QML-ru.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-tr.po b/po/QML-tr.po index 2678cff..aa8dfd9 100644 --- a/po/QML-tr.po +++ b/po/QML-tr.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/QML-zh_Hant.po b/po/QML-zh_Hant.po index 2678cff..aa8dfd9 100644 --- a/po/QML-zh_Hant.po +++ b/po/QML-zh_Hant.po @@ -328,10 +328,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - linear trend model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - linear trend model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model" msgstr "" @@ -340,10 +336,6 @@ msgctxt "predictiveAnalytics|" msgid "bsts - autoregressive model - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bsts - autoregressive model - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "prophet" msgstr "" @@ -352,18 +344,6 @@ msgctxt "predictiveAnalytics|" msgid "prophet - regression" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "prophet - regression + lag" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression" -msgstr "" - -msgctxt "predictiveAnalytics|" -msgid "xgboost - regression + lag" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "bart - regression" msgstr "" @@ -372,10 +352,6 @@ msgctxt "predictiveAnalytics|" msgid "bart - regression + lag" msgstr "" -msgctxt "predictiveAnalytics|" -msgid "bart - stack" -msgstr "" - msgctxt "predictiveAnalytics|" msgid "Evaluation Metrics" msgstr "" @@ -493,9 +469,9 @@ msgid "All data points" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Advanced Options" +msgid "Skip between training slices" msgstr "" msgctxt "predictiveAnalytics|" -msgid "Skip between training slices" +msgid "Impute missing values" msgstr "" diff --git a/po/R-de.po b/po/R-de.po index 4258384..dced803 100644 --- a/po/R-de.po +++ b/po/R-de.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jaspPredictiveAnalytics 0.17.3\n" -"POT-Creation-Date: 2023-07-25 07:41\n" +"POT-Creation-Date: 2023-09-23 02:42\n" "PO-Revision-Date: 2023-08-06 09:49+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: German This is a warning!

\n Error proportion limit of %#.2f is crossed for the first time at data point %i in the estimation period. At this point on average %#.2f data points are estimates to be out of control with an lower limit of %#.2f and an upper limit of %#.2f

" +msgid "" +"

This is a warning!

\n" +" Error proportion limit of %#.2f is crossed for " +"the first time at data point %i in the estimation period. At this point on " +"average %#.2f data points are estimates to be out of control with an lower " +"limit of %#.2f and an upper limit of %#.2f

" msgstr "" "

Dies ist eine Warnung!

\n" " Die Fehleranteilsgrenze von %#.2f wird zum ersten " @@ -25,13 +30,20 @@ msgstr "" "Zeitpunkt werden im Durchschnitt %#.2f Datenpunkte mit einer Untergrenze von " "%#.2f und einer Obergrenze von %#.2f als außer-Kontrolle eingeschätzt

" -msgid "

No warning. The limit of %#.2f is not crossed during the estimation period.

" +msgid "" +"

No warning. The limit of %#.2f is not crossed during the estimation " +"period.

" msgstr "" "

Keine Warnung. Die Grenze von %#.2f wird während des " "Schätzungszeitraums nicht überschritten.

" #, fuzzy -msgid "

This is a warning!

\n Error proportion limit of %#.2f is crossed for the first time in %i data points in the prediction period. At this point on average %#.2f data points will be out of control with an lower limit of %#.2f and an upper limit of %#.2f

" +msgid "" +"

This is a warning!

\n" +" Error proportion limit of %#.2f is crossed for " +"the first time in %i data points in the prediction period. At this point on " +"average %#.2f data points will be out of control with an lower limit of " +"%#.2f and an upper limit of %#.2f

" msgstr "" "

Dies ist eine Warnung!

\n" " Die Fehleranteilsgrenze von %#.2f wird zum ersten " @@ -39,7 +51,9 @@ msgstr "" "werden im Durchschnitt %#.2f Datenpunkte außer Kontrolle sein, mit einer " "Untergrenze von %#.2f und einer Obergrenze von %#.2f

" -msgid "

No warning. The limit of %#.2f is not crossed during the prediction period.

" +msgid "" +"

No warning. The limit of %#.2f is not crossed during the prediction " +"period.

" msgstr "" "

Keine Warnung. Die Grenze von %#.2f wird während des " "Vorhersagezeitraums nicht überschritten.

" @@ -74,33 +88,34 @@ msgstr "Prozent" msgid "Average Deviation" msgstr "Mittlere Abweichung" -msgid "Running model" +msgid "Running models" msgstr "" -msgid "/" -msgstr "/" - -msgid ":" -msgstr ":" - msgid "R%s" msgstr "R%s" -msgid "Cannot compute forecast. Larger forecast horizon requested than indicated by 'Include in Training' variable. Reduce forecast horizon or change training indicator" +msgid "" +"Cannot compute forecast. Larger forecast horizon requested than indicated by " +"'Include in Training' variable. Reduce forecast horizon or change training " +"indicator" msgstr "" "Prognose kann nicht berechnet werden. Es wurde ein größerer Prognosehorizont " "angefordert, als in der Variablen 'In Training einbeziehen' angegeben. " "Verringern Sie den Prognosehorizont oder ändern Sie den Trainingsindikator" #, fuzzy -msgid "Warning! The process is predicted to cross the out-of-control probability threshold for the first time at time point:" +msgid "" +"Warning! The process is predicted to cross the out-of-control probability " +"threshold for the first time at time point:" msgstr "" "Warnung! Es wird vorhergesagt, dass der Prozess den Außer-Kontrolle-" "Wahrscheinlichkeitsschwellenwert zum ersten Mal bei folgendem Zeitpunkt " "überschreitet:" #, fuzzy -msgid "No warning. The process is not predicted to cross the out-of-control probability threshold. The highest out-of-bound probability is:" +msgid "" +"No warning. The process is not predicted to cross the out-of-control " +"probability threshold. The highest out-of-bound probability is:" msgstr "" "Keine Warnung. Es wird nicht vorhergesagt, dass der Prozess den Außer-" "Kontrolle-Wahrscheinlichkeitsschwellenwert überschreitet. Die höchste " @@ -108,3 +123,9 @@ msgstr "" msgid "percent." msgstr "Prozent." + +#~ msgid "/" +#~ msgstr "/" + +#~ msgid ":" +#~ msgstr ":" diff --git a/po/R-es.po b/po/R-es.po index a919780..b3066ea 100644 --- a/po/R-es.po +++ b/po/R-es.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: jaspPredictiveAnalytics 0.17.3\n" -"POT-Creation-Date: 2023-07-25 07:41\n" +"POT-Creation-Date: 2023-09-23 02:42\n" "PO-Revision-Date: 2023-08-04 12:02+0000\n" "Last-Translator: ecadrian \n" "Language-Team: Spanish This is a warning!

\n Error proportion limit of %#.2f is crossed for the first time at data point %i in the estimation period. At this point on average %#.2f data points are estimates to be out of control with an lower limit of %#.2f and an upper limit of %#.2f

" +msgid "" +"

This is a warning!

\n" +" Error proportion limit of %#.2f is crossed for " +"the first time at data point %i in the estimation period. At this point on " +"average %#.2f data points are estimates to be out of control with an lower " +"limit of %#.2f and an upper limit of %#.2f

" msgstr "" "

¡Esto es una advertencia!

\n" " El límite de proporción de error de %#.2f se " @@ -24,12 +29,19 @@ msgstr "" "En este punto en promedio %#.2f puntos de datos se estima fuera de control " "con un límite inferior de %#.2f y un límite superior de %#.2f

" -msgid "

No warning. The limit of %#.2f is not crossed during the estimation period.

" +msgid "" +"

No warning. The limit of %#.2f is not crossed during the estimation " +"period.

" msgstr "" "

Sin advertencia. No se supera el límite de %#.2f durante el periodo de " "estimación.

This is a warning!

\n Error proportion limit of %#.2f is crossed for the first time in %i data points in the prediction period. At this point on average %#.2f data points will be out of control with an lower limit of %#.2f and an upper limit of %#.2f

" +msgid "" +"

This is a warning!

\n" +" Error proportion limit of %#.2f is crossed for " +"the first time in %i data points in the prediction period. At this point on " +"average %#.2f data points will be out of control with an lower limit of " +"%#.2f and an upper limit of %#.2f

" msgstr "" "

¡Esto es una advertencia!

\n" " El límite de proporción de error de %#.2f se " @@ -37,7 +49,9 @@ msgstr "" "este punto en promedio %#.2f puntos de datos estarán fuera de control con un " "límite inferior de %#.2f y un límite superior de %#.2f

" -msgid "

No warning. The limit of %#.2f is not crossed during the prediction period.

" +msgid "" +"

No warning. The limit of %#.2f is not crossed during the prediction " +"period.

" msgstr "" "

Sin complicaciones. El límite de %#.2f no se ha traspasado durante el " "período de predicción.

" @@ -72,33 +86,41 @@ msgstr "Por ciento" msgid "Average Deviation" msgstr "Desviación promedio" -msgid "Running model" +#, fuzzy +msgid "Running models" msgstr "Ejecutando modelo" -msgid "/" -msgstr "/" - -msgid ":" -msgstr ":" - msgid "R%s" msgstr "R%s" -msgid "Cannot compute forecast. Larger forecast horizon requested than indicated by 'Include in Training' variable. Reduce forecast horizon or change training indicator" +msgid "" +"Cannot compute forecast. Larger forecast horizon requested than indicated by " +"'Include in Training' variable. Reduce forecast horizon or change training " +"indicator" msgstr "" "No se puede calcular la predicción. Se solicitó un horizonte de predicción " "más largo que el indicado por la variable 'Incluir en el adiestramiento'. " "Reduzca el horizonte de predicción o cambie le indicador de adiestramiento" -msgid "Warning! The process is predicted to cross the out-of-control probability threshold for the first time at time point:" +msgid "" +"Warning! The process is predicted to cross the out-of-control probability " +"threshold for the first time at time point:" msgstr "" "¡Advertencia! Se predice que el proceso sobrepase el umbral de la " "probabilidad fuera-de-control por primera vez en el momento temporal:" -msgid "No warning. The process is not predicted to cross the out-of-control probability threshold. The highest out-of-bound probability is:" +msgid "" +"No warning. The process is not predicted to cross the out-of-control " +"probability threshold. The highest out-of-bound probability is:" msgstr "" "Sin complicaciones. No se predice que el proceso sobrepase el umbral de la " "probabilidad fuera-de-control. La mayor probabilidad fuera-de-límite es:" msgid "percent." msgstr "por ciento." + +#~ msgid "/" +#~ msgstr "/" + +#~ msgid ":" +#~ msgstr ":" diff --git a/po/R-jaspPredictiveAnalytics.pot b/po/R-jaspPredictiveAnalytics.pot index 6b94c3b..4bc3005 100644 --- a/po/R-jaspPredictiveAnalytics.pot +++ b/po/R-jaspPredictiveAnalytics.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" -"Project-Id-Version: jaspPredictiveAnalytics 0.18.0\n" -"POT-Creation-Date: 2023-07-27 12:21\n" +"Project-Id-Version: jaspPredictiveAnalytics 0.18.1\n" +"POT-Creation-Date: 2023-09-23 02:42\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,13 +55,7 @@ msgstr "" msgid "Average Deviation" msgstr "" -msgid "Running model" -msgstr "" - -msgid "/" -msgstr "" - -msgid ":" +msgid "Running models" msgstr "" msgid "R%s" From 17f560eb2015746c25e9f22a7a91b87528822061 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sat, 30 Sep 2023 04:42:07 +0200 Subject: [PATCH 09/11] Translated using Weblate (Polish) (#12) Currently translated at 29.5% (36 of 122 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/pl/ Co-authored-by: Tomasz Misiuro --- po/QML-pl.po | 98 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 35 deletions(-) diff --git a/po/QML-pl.po b/po/QML-pl.po index aa8dfd9..f2130af 100644 --- a/po/QML-pl.po +++ b/po/QML-pl.po @@ -31,7 +31,7 @@ msgstr "" msgctxt "multiVarControl|" msgid "Transpose table" -msgstr "" +msgstr "Transponuj tabelę" msgctxt "multiVarControl|" msgid "Overall control plot" @@ -39,19 +39,19 @@ msgstr "" msgctxt "multiVarControl|" msgid "Points" -msgstr "" +msgstr "Punkty" msgctxt "multiVarControl|" msgid "Line" -msgstr "" +msgstr "Linia" msgctxt "multiVarControl|" msgid "Both" -msgstr "" +msgstr "Oba" msgctxt "multiVarControl|" msgid "Add jitter" -msgstr "" +msgstr "Dodaj losowy szum" msgctxt "multiVarControl|" msgid "Out-of-bound metric" @@ -59,11 +59,11 @@ msgstr "" msgctxt "multiVarControl|" msgid "Number" -msgstr "" +msgstr "Liczba" msgctxt "multiVarControl|" msgid "Proportion" -msgstr "" +msgstr "Proporcja" msgctxt "multiVarControl|" msgid "Proportion limits for reporting" @@ -99,7 +99,7 @@ msgstr "" msgctxt "multiVarControl|" msgid "Prediction" -msgstr "" +msgstr "Przewidywanie" msgctxt "multiVarControl|" msgid "Prediction horizon" @@ -111,7 +111,7 @@ msgstr "" msgctxt "multiVarControl|" msgid "Prediction table" -msgstr "" +msgstr "Tabela przewidywań" msgctxt "multiVarControl|" msgid "Show predicted number" @@ -123,7 +123,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Dependent Variable" -msgstr "" +msgstr "Zmienna zależna" msgctxt "predictiveAnalytics|" msgid "Time series variable to be predicted. (needed)" @@ -131,7 +131,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Time" -msgstr "" +msgstr "Czas" msgctxt "predictiveAnalytics|" msgid "" @@ -142,7 +142,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Covariates" -msgstr "" +msgstr "Współzmienne" msgctxt "predictiveAnalytics|" msgid "Covariates to be used in the prediction model. (optional)" @@ -150,7 +150,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Factors" -msgstr "" +msgstr "Czynniki" msgctxt "predictiveAnalytics|" msgid "Include in Training" @@ -174,7 +174,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "σ threshold" -msgstr "" +msgstr "Próg σ" msgctxt "predictiveAnalytics|" msgid "Trimmed mean" @@ -182,7 +182,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Percent" -msgstr "" +msgstr "Procent" msgctxt "predictiveAnalytics|" msgid "Custom period" @@ -190,11 +190,11 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Start" -msgstr "" +msgstr "Początek" msgctxt "predictiveAnalytics|" msgid "End" -msgstr "" +msgstr "Koniec" msgctxt "predictiveAnalytics|" msgid "Display control chart" @@ -206,19 +206,19 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Points" -msgstr "" +msgstr "Punkty" msgctxt "predictiveAnalytics|" msgid "Line" -msgstr "" +msgstr "Linia" msgctxt "predictiveAnalytics|" msgid "Both" -msgstr "" +msgstr "Oba" msgctxt "predictiveAnalytics|" msgid "All data" -msgstr "" +msgstr "Wszystkie dane" msgctxt "predictiveAnalytics|" msgid "Control bounds" @@ -234,11 +234,11 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Diagnostics" -msgstr "" +msgstr "Diagnostyka" msgctxt "predictiveAnalytics|" msgid "Tables" -msgstr "" +msgstr "Tabele" msgctxt "predictiveAnalytics|" msgid "Custom table focus" @@ -246,11 +246,11 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Plots" -msgstr "" +msgstr "Wykresy" msgctxt "predictiveAnalytics|" msgid "Histogram" -msgstr "" +msgstr "Histogram" msgctxt "predictiveAnalytics|" msgid "Lags" @@ -266,11 +266,11 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Remove zero-variance variables" -msgstr "" +msgstr "Usuń zmienne o wariancji równej 0" msgctxt "predictiveAnalytics|" msgid "Remove variables that are stronger correlated than:" -msgstr "" +msgstr "Usuń zmienne, które wykazują korelację wyższą niż:" msgctxt "predictiveAnalytics|" msgid "Forecast Evaluation" @@ -306,7 +306,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Model Choice" -msgstr "" +msgstr "Wybór modelu" msgctxt "predictiveAnalytics|" msgid "linear regression - y ~ time" @@ -314,7 +314,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "linear regression - regression" -msgstr "" +msgstr "regresja liniowa – regresja" msgctxt "predictiveAnalytics|" msgid "linear regression - regression + lag" @@ -394,11 +394,11 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Root mean squared error" -msgstr "" +msgstr "RMSE" msgctxt "predictiveAnalytics|" msgid "R²" -msgstr "" +msgstr "R²" msgctxt "predictiveAnalytics|" msgid "PIT Binned Density Plots" @@ -418,7 +418,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Method" -msgstr "" +msgstr "Metoda" msgctxt "predictiveAnalytics|" msgid "Expectation–maximization" @@ -442,7 +442,7 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "% of data" -msgstr "" +msgstr "% danych" msgctxt "predictiveAnalytics|" msgid "Model weights" @@ -462,11 +462,11 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "data points" -msgstr "" +msgstr "punkt danych" msgctxt "predictiveAnalytics|" msgid "All data points" -msgstr "" +msgstr "Wszystkie punkty danych" msgctxt "predictiveAnalytics|" msgid "Skip between training slices" @@ -475,3 +475,31 @@ msgstr "" msgctxt "predictiveAnalytics|" msgid "Impute missing values" msgstr "" + +msgctxt "predictiveAnalytics|" +msgid "bsts - linear trend model - regression + lag" +msgstr "" + +msgctxt "predictiveAnalytics|" +msgid "bsts - autoregressive model - regression + lag" +msgstr "" + +msgctxt "predictiveAnalytics|" +msgid "prophet - regression + lag" +msgstr "" + +msgctxt "predictiveAnalytics|" +msgid "xgboost - regression" +msgstr "" + +msgctxt "predictiveAnalytics|" +msgid "xgboost - regression + lag" +msgstr "" + +msgctxt "predictiveAnalytics|" +msgid "bart - stack" +msgstr "" + +msgctxt "predictiveAnalytics|" +msgid "Advanced Options" +msgstr "Opcje zaawansowane" From 36e6a4eab5a0c71d047aec0b5f728e056e88f7a0 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sat, 7 Oct 2023 04:41:56 +0200 Subject: [PATCH 10/11] Translations update from Hosted Weblate (#13) * Translated using Weblate (German) Currently translated at 67.8% (78 of 115 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/de/ * Translated using Weblate (Spanish) Currently translated at 100.0% (115 of 115 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/es/ * Translated using Weblate (Galician) Currently translated at 100.0% (115 of 115 strings) Translation: JASP/jaspPredictiveAnalytics-QML Translate-URL: https://hosted.weblate.org/projects/jasp/jasppredictiveanalytics/gl/ --------- Co-authored-by: Johannes Keyser Co-authored-by: ecadrian --- po/QML-de.po | 7 ++----- po/QML-es.po | 10 +++++----- po/QML-gl.po | 14 +++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/po/QML-de.po b/po/QML-de.po index ed6ff5b..542179a 100644 --- a/po/QML-de.po +++ b/po/QML-de.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-09-08 08:59+0000\n" +"PO-Revision-Date: 2023-10-06 00:47+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: German \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0.1-dev\n" +"X-Generator: Weblate 5.1-dev\n" "X-Qt-Contexts: true\n" msgctxt "Description|" @@ -80,12 +80,10 @@ msgctxt "multiVarControl|" msgid "Proportion limits for reporting" msgstr "" -#, fuzzy msgctxt "multiVarControl|" msgid "Estimation limit" msgstr "Schätzgrenze" -#, fuzzy msgctxt "multiVarControl|" msgid "Prediction limit" msgstr "Vorhersagegrenze" @@ -95,7 +93,6 @@ msgctxt "multiVarControl|" msgid "Proportion Estimation" msgstr "Anteilsschätzung" -#, fuzzy msgctxt "multiVarControl|" msgid "Summarise after every" msgstr "Zusammenfassen nach jeweils" diff --git a/po/QML-es.po b/po/QML-es.po index f068f17..b734ddc 100644 --- a/po/QML-es.po +++ b/po/QML-es.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-08-03 04:54+0000\n" +"PO-Revision-Date: 2023-10-06 15:40+0000\n" "Last-Translator: ecadrian \n" "Language-Team: Spanish \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0-dev\n" +"X-Generator: Weblate 5.1-dev\n" "X-Qt-Contexts: true\n" msgctxt "Description|" @@ -165,7 +165,7 @@ msgstr "Factores" msgctxt "predictiveAnalytics|" msgid "Include in Training" -msgstr "Incluir en el Entrenamiento" +msgstr "Incluir en el Adiestramiento" msgctxt "predictiveAnalytics|" msgid "" @@ -313,7 +313,7 @@ msgstr "Nº máximo de trozos" msgctxt "predictiveAnalytics|" msgid "Cumulative training" -msgstr "Adestramiento acumulativo" +msgstr "Adiestramiento acumulativo" msgctxt "predictiveAnalytics|" msgid "Show evaluation plan" @@ -513,4 +513,4 @@ msgstr "Opciones Avanzadas" msgctxt "predictiveAnalytics|" msgid "Skip between training slices" -msgstr "Salto entre trozos de adiestramiento" +msgstr "Salto entre trozos de adiestramientos" diff --git a/po/QML-gl.po b/po/QML-gl.po index c9770b1..5bcc480 100644 --- a/po/QML-gl.po +++ b/po/QML-gl.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2023-08-03 04:54+0000\n" +"PO-Revision-Date: 2023-10-06 15:40+0000\n" "Last-Translator: ecadrian \n" "Language-Team: Galician \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0-dev\n" +"X-Generator: Weblate 5.1-dev\n" "X-Qt-Contexts: true\n" msgctxt "Description|" @@ -164,7 +164,7 @@ msgstr "Factores" msgctxt "predictiveAnalytics|" msgid "Include in Training" -msgstr "Incluír no Adestramento" +msgstr "Incluír no Ensaio" msgctxt "predictiveAnalytics|" msgid "" @@ -174,7 +174,7 @@ msgid "" "factors are supplied" msgstr "" "Variable de tipo lóxico (só con 0 ou 1) que indica que casos deben " -"utilizarse para adestrar e verificar os modelos (= 1), e que casos deben " +"utilizarse para ensaiar e verificar os modelos (= 1), e que casos deben " "predicirse (= 0). Esta variable é necesaria para facer predicións cando se " "ofrecen as covariantes e os factores" @@ -296,7 +296,7 @@ msgstr "Plan de Avaliación" msgctxt "predictiveAnalytics|" msgid "Training window" -msgstr "Xanela de adestramento" +msgstr "Xanela de ensaio" msgctxt "predictiveAnalytics|" msgid "Prediction window" @@ -312,7 +312,7 @@ msgstr "Nº máximo de anacos" msgctxt "predictiveAnalytics|" msgid "Cumulative training" -msgstr "Adestramento acumulativo" +msgstr "Ensaio acumulativo" msgctxt "predictiveAnalytics|" msgid "Show evaluation plan" @@ -512,4 +512,4 @@ msgstr "Opcións Avanzadas" msgctxt "predictiveAnalytics|" msgid "Skip between training slices" -msgstr "Salto entre anacos de adestramento" +msgstr "Salto entre anacos de ensaios" From b84fd43a614dca353a5b0a42f5e6f474f2f07718 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 14 Oct 2023 02:42:22 +0000 Subject: [PATCH 11/11] updated translation files --- .../jaspPredictiveAnalytics-es.qm | Bin 14883 -> 14889 bytes .../jaspPredictiveAnalytics-gl.qm | Bin 14637 -> 14589 bytes .../jaspPredictiveAnalytics-pl.qm | Bin 16 -> 2956 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/inst/qml/translations/jaspPredictiveAnalytics-es.qm b/inst/qml/translations/jaspPredictiveAnalytics-es.qm index 3c0e53310516150294ba2986535b070790e229f3..78790f499c7a3ea630a7d120344251d5a0e38e59 100644 GIT binary patch delta 886 zcmX9+SxggA6g@N3X*)A?MntI_mI{a>C@7^YDluRL67@rfN|0!fC{ai(tp+zVs8Lb0 zj!U9OV_X{%3`I~Re1M_`t$=HwDq1Bj!F`MSCH}mdci+9|-gC}7Zg<&tj}StE+)g00 z#u;WxNB}?P1Te$_K6*O9N&n-JbKuWgfbe%neKiX}Hs;2;f#4KmpV>?Kwa#_MQh#)8 zUk^k((P#Mt7;^CI`!^tF2Gfc0!1(P|ZUmMjieav6m3}8Y$n^?UV z7}&yYEqe|Ojb^KEcnJ?|jpPAz{Qqbk$u-MiUiF3uziPMVE>J-m07 zFWuSIQwiIsYw|Rbbc{Zvm6(~g=*uHHlD1A?yn1v>ebqFQ*?vZ;w z;o?s#@edNNMukwE;9g%79jmxJhk8Dk+snSGwYAq==$SWTWts)ew?0%n0-g@Qk zCyC@)m)w&)i#U}lnh96vC+}2(<1FOfY$dIfG#LC+$+q=t(W-2_ZKuC+LaAPMobH2G zDjn_VB=H}``*jroj4A-)lHIR4v%E%i%x)Y-DUc-TTkw aboLj9xIYdrl$i{5VMH2>V)vPdHOfD2{`30) delta 891 zcmX9+X-pGg5PjQr+wLyi6;SE{mU5^lC?IV;F-A}@0Zo*sScwP55CNss1EP`$7?p_P zdL+hRv?8E}8jE-l6FEErqM)FGB1V)16TG8FKpf+rZ}xlp&6{~|rqb@PAM@n`fRr{M zsH!B`Fxv!n%0*yo7TEAuKq>r>V=KX4GXazP5!0UtAQ`L7F2H{Qk}FOSzO!VnK2L|% z!~1~nA`Fg1^e=DvFEr5poAC2P`b$-O>)2!&bY6OI0r4?1wQ`AglmhB-B zbyC^Z>kUZ#s<0?(NL8!KyqyiO7L~1U3*fy%Rozue1Z!ET^9D)pX8l($0z3!VdCry8 zm=9~6RY!S7HYF(x2r$bTjDF1?_Q26rfFEGXkJpoCCtG{%1z`Hby4Cl9$c^k5`%Q{( z)N_4E<`jqe%%*%|y{x`uE29{vesop^7>3l%`6OTL((rdq0yB5Z-Hd_pl!qBZM7HKs zW;J0yG*@z?iQ7|iuca0U8`K6qAZ5n=+M-Y;SzDuZu3JGhjB{wkP*4v{bn_#xJ_71`LHF`E z5F8_TS{td_IKguLEx=_9g%)x%$Rw1By+B}@$I{ATK)cl=x8^x8rrhIhu?rYwmFFw< zc`jX2Nei(!beHDR5=e)29qZ|@?{Z!5w9WLYS+vAcRUuN0t|o^@cZ%nNs))rTx<1Fy zY&*rSo;ftL4)M)`MAB3!sb)0LCLfXf%_f@OGAS;PJQ&j_CENaa(I6dqYNy?}C^@$} z=swymwLXg{i~mUOAG?UaHw`e)c70G9B{mWZk?QjDzMu^;BOaO9gmmmc8f@^#X1f17 g)9H+*Z#$ucxq2oPh)kTEIyFunn83MiPPIvY0rlJWq5uE@ diff --git a/inst/qml/translations/jaspPredictiveAnalytics-gl.qm b/inst/qml/translations/jaspPredictiveAnalytics-gl.qm index d397a93658df7488f23d7cd6efa010b5accb49f4..25eb9d623a090e5d3d36aad08b2e0d83fa26d093 100644 GIT binary patch delta 977 zcmYLHZ%`C<7=Cu|_U?A~c2~UMYy>$xC>%Y3@I=rk6Ei6MqNFjzh=`0@ryej3&d_~0 zY04T4w{pf&%P~Yl4)d`5Lw*3UPzM21Q_;*bX0)NPVysCRduE*M!|uDkci;DU-sgFL zZNc%4A0^5WpnMSU-fT)s&fNtm{R_Z-1ybfhz#=?~lb(ch$PYX0(726w0u16$q(GO97+{}a%h82kG#ATvoA#7w}qLb$5dvp8ND8m$8ozZ7C; zStpDL4}*(`EeDLXkLpFa=PH zEMFacwsc|FdLVJp!Z} zl4tn>AkLKLwJ+sh8>F&1UF>s7jY+8c6d)yn&*_`{TUW|yV}wI`Vx|4 zo5i9#)Gep^Nts?J*I&Fy=ZfW{4{}J+Blq~c6yTN58th8jF84Rs>D*rVmkJX|66HU# zP7pn$loq4CyxQBT5W~EhMz|qH)wt1sGzpQ+ zO|PP}tM!~hvMTrV{0^G-#7h0M)Cl9Zdh}ia;99F+`zens6ZD(UEvC#0!xBb zX8YNv883xsOMJj64Kli)H{Ls6%lqQqRH8u_uhG>S*U~_W_h`LEzvzQ~@ag=Q??2}|=lkES zI_%mUC!7Gvx`CwE-sA*FE4UGR0rd&E%t?Tb`GkXP;EvdV;fW~dEdnqHbH@gNga(ux z*a{5udEKhVjo`)~fQ)VEw?6~SCcORcC6HOjbR!+GZf0&tRaER?LeIYk;?6PQ3slGS zGw)qr1L=9}c>iKx;39TI%>!UiGwbUN5g*SsOI-lp`w1=U*fa6O7c+g}0WMMR>RCzxkMu3KcLCA;oN}ub7@ERa z=H&ws4P1_YHZ``9D;;-+-bHd{#a1A(UR%Ma^F!SFO+i3x;`VPjOE&)DP93=ljCsX{ z_%^`i&qiVG~ z%wX0Quf1auY;MD^&K9x&LsNAgk;fX^x=vAc24hkOS+m?V{*vB+M#)tOf4s>eiFTpgnnVV2g$oM3Nn@NQ7R$Ue{)j%Y%CwEnbHuveh|ka{Hp%&<9wQ#kc~1N3;?de~X>yar*8Ofu zUNwjvg*1}E-C|$uS;C3p`xu1@u&n2Wt##L{ctmrWl-$uwVINVl;a=5T5S zRk`G>siZ1Cmh)ODv?!15uXAL!F{%4#Mi zU@^O$jz0_FyTIv`aa?K|=Fy>(RF@N4J~CKn^`)NFj2__wI*k(t diff --git a/inst/qml/translations/jaspPredictiveAnalytics-pl.qm b/inst/qml/translations/jaspPredictiveAnalytics-pl.qm index be651eede2edc9cb0da5c140b31664afee169fa8..661e0991dd88a57532915ff45eebee29947ffe68 100644 GIT binary patch literal 2956 zcma)8U1%It6h7PC+1+fGB&1?f4e4!ZU!;|)m`W%@l8siH*qE+Xiine$>+UqObGLWy zrfg7ON`3L6P_$14ZKbxNV5lfQ#2=a$5k%?_3by!A>|=e1kAi;pZgzHq&cuhwgJyfBJ1}pcRt)nwB@eFo}UD6XdV2h zjOQO%FFbY~ILp?eg*dv?x@X_FUO#&S?>}Q*IkyU&Th_|*k3@w*>t^-~0~_6_-B!0r+cu2cB95k8^#${x*g@xBJ;B>P-FR zfy^9`X&049kV`h5AVxm^4{@EMCRQOWQG;rEO)QJ6Fz&kSgr^jjIV}5Y4PSZB*>X|@ zN(w)v@v?M;=E;s?G7~~oW8W^&GWY~50v;PtG!YJ%b!W*w-KfncuqtBb8_2Uj zikcC(?5ywt6~^Ye4^a}CIQrqCM@`&q!4|~!k+ri9_`~K!UAN)_O zdPipw^2Rpwx6xTWl3y(0*l~)D7&5f#w3eDc^J=EVU_;9alVZ`9o~?LtvqtE6SG*Rk z-VC33>J{L1q&8UMbso4pPz+|^wIv(N@LpIB2A(QF(RPE8#8!0hdP|;N2}GzBk*Jg+ z9R`4Q4^B=bv-DKpCWZ~rBr0hlP=`VUQE2W7+fhO$XC0(N2-CC$O3?Guamb!SUZ_Mx z+O-kaa8(t_6>Cj2VL)r3%dn>!L7Pz{LMhG&m-}q8Dm=#+ zPArSQb<=Tx5Ri%xa~#dFWLz7u?HnW9WcU_Wq#Gx+A?k!Y-)S!EldCoNAm_Wgwiq*Isu<&F96}pT|Da^+~>~3TL zb1i~M&t1Qkm~{Yh6R1l!TcMtXDAYQtY?&;#V%NdjvG;6QTU7Fp=Z#0$6h`SXWv`Yz z8ACX>+8-J1LuI4&_v*v%|JeSh5uJ7yJtsKVv8O)vSR0o9I>VZ6HT%qs2d%#qksa~z q4P{Fvc}4Ot#JR}!buAJ*t_Mx)r$Q{f8X*?HI}NP@tSbC?v-t<^GO0@d literal 16 YcmcE7ks@*G{hX<16=n7(EZln+07b?KzW@LL