From fe56a04e38bfd4c9dc00c42fd48d82af6674a960 Mon Sep 17 00:00:00 2001 From: "C. Regouby" Date: Sun, 29 Sep 2024 08:29:35 +0200 Subject: [PATCH] improve `weight` message. --- R/hardhat.R | 8 ++-- inst/po/fr/LC_MESSAGES/R-tabnet.mo | Bin 5661 -> 5877 bytes man/tabnet_fit.Rd | 2 +- po/R-fr.po | 61 ++++++++++++++++++----------- po/R-tabnet.pot | 54 +++++++++++++++---------- 5 files changed, 76 insertions(+), 49 deletions(-) diff --git a/R/hardhat.R b/R/hardhat.R index be2aaf6..20c748f 100644 --- a/R/hardhat.R +++ b/R/hardhat.R @@ -36,7 +36,7 @@ #' If no argument is supplied, this will use the default values in [tabnet_config()]. #' @param from_epoch When a `tabnet_model` is provided, restore the network weights from a specific epoch. #' Default is last available checkpoint for restored model, or last epoch for in-memory model. -#' @param weights Unused. +#' @param weights Unused. Placeholder for hardhat::importance_weight() variables. #' @param ... Model hyperparameters. #' Any hyperparameters set here will update those set by the config argument. #' See [tabnet_config()] for a list of all possible hyperparameters. @@ -119,7 +119,7 @@ tabnet_fit.default <- function(x, ...) { tabnet_fit.data.frame <- function(x, y, tabnet_model = NULL, config = tabnet_config(), ..., from_epoch = NULL, weights = NULL) { if (!is.null(weights)) { - message(gettextf("Configured `weights` will not be used")) + message(gettextf("Configured `weights` variables will not be used as predictors")) } processed <- hardhat::mold(x, y) check_type(processed$outcomes) @@ -142,7 +142,7 @@ tabnet_fit.data.frame <- function(x, y, tabnet_model = NULL, config = tabnet_con tabnet_fit.formula <- function(formula, data, tabnet_model = NULL, config = tabnet_config(), ..., from_epoch = NULL, weights = NULL) { if (!is.null(weights)) { - message(gettextf("Configured `weights` will not be used")) + message(gettextf("Configured `weights` variables will not be used as predictors")) } processed <- hardhat::mold( formula, data, @@ -171,7 +171,7 @@ tabnet_fit.formula <- function(formula, data, tabnet_model = NULL, config = tabn tabnet_fit.recipe <- function(x, data, tabnet_model = NULL, config = tabnet_config(), ..., from_epoch = NULL, weights = NULL) { if (!is.null(weights)) { - message(gettextf("Configured `weights` will not be used")) + message(gettextf("Configured `weights` variables will not be used as predictors")) } processed <- hardhat::mold(x, data) check_type(processed$outcomes) diff --git a/inst/po/fr/LC_MESSAGES/R-tabnet.mo b/inst/po/fr/LC_MESSAGES/R-tabnet.mo index f6641153ed4220d76ec9bbc425de644c884d499b..16e66cb47031d2b19f78bfcab2ecfe411890badd 100644 GIT binary patch delta 814 zcmXZaL1+^}6oBEEP1eEtMd(h$QKX3u#ibiGr7U z6BSR@qv=&6_-ktVS0;g?x8~ z7+`E+ggqid*kSNPJi!zA6!+j7#xdd**@@@z4PI|LJ8Ej=SFEV%>ZPW=~;y(O|M{&Dfk(K`N3Ln4}Beagt}%A(FyNcnTk(F7O}rur3;CIM&%%KiwrV zq1Ry+|Kbju*+4OP4fR1@W0L&h4~ksGQPdwU;z|62x`45e$Q0heY5az|Q|WGz6}*W_ zJRNR$3v)cz@c<6?h@8Q5xF44>hCeX#kV*eWkp#X%4&=6LGtzmXyTX+U#kxUF!ZJ7X zf2N&5qukKS!1AY8?#=94sOW}YL}36&$waix|}Ur*<8W2 z)fKByP{mS3>VB?>ydo!KzLAQ_foJ2X9~`8Xr-y)WLXS zcPw7}-1gp+aF*Lgz5eE&wO^gR5jHNG$~McTVnxlfWwl}zEW5sBt9)s0⋘BN#`)D TWk+=_8g7oa!3k$2nDPAwd98Wm delta 728 zcmX}pOGs2v9LMpWcgD1wX>3NTNt>=%MAX>atG#rQ_97H~1QEG1YtjL6%GZDvwuxvN zQ_DaRve}7uQHyp4MNo?r7lCbC*rH7fF~slj4jnjr&i~xU`TzgtZ}Ro2>7UWyD=`wx zT4tz3I)VStj2TO6$5}j$ztP3ofOH(Y@C)XOUJ6Rbh{L6lgNr}4O`2k7JP<_xP&ILiE`gJ*h{>MaddY3`yH4hobhg_VN#&*GHr~ID$uU z1>0}~O(89n(m8yBgPgDTEX;>>`=}lt;0^qMw=oj+JCniB#EWQtFctIlu%CDx&thkl zbPJzi6Ru$jqt((JUdA){3$Id$4l+%v=&UM1!=yxI@u8l<%=( z;RCG94Re}e`G?k#xVcttVQ177C3hvfg7w_0%w>j#?BVQ~-JiC{N7MJb-qPh$kbe}3dv7E2 KmNyf<8Qca#ja;e# diff --git a/man/tabnet_fit.Rd b/man/tabnet_fit.Rd index 729a8f9..1afa30b 100644 --- a/man/tabnet_fit.Rd +++ b/man/tabnet_fit.Rd @@ -89,7 +89,7 @@ If no argument is supplied, this will use the default values in \code{\link[=tab \item{from_epoch}{When a \code{tabnet_model} is provided, restore the network weights from a specific epoch. Default is last available checkpoint for restored model, or last epoch for in-memory model.} -\item{weights}{Unused.} +\item{weights}{Unused. Placeholder for hardhat::importance_weight() variables.} \item{formula}{A formula specifying the outcome terms on the left-hand side, and the predictor terms on the right-hand side.} diff --git a/po/R-fr.po b/po/R-fr.po index 0fddb15..3dec00a 100644 --- a/po/R-fr.po +++ b/po/R-fr.po @@ -2,15 +2,15 @@ msgid "" msgstr "" "Project-Id-Version: tabnet 0.4.0.9000\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-21 22:37+0100\n" -"PO-Revision-Date: 2024-02-21 22:42+0100\n" +"POT-Creation-Date: 2024-09-29 08:20+0200\n" +"PO-Revision-Date: 2024-09-29 08:25+0200\n" "Last-Translator: Christophe Regouby \n" "Language-Team: fr\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.5\n" #: dials.R:3 msgid "Package \"dials\" needed for this function to work. Please install it." @@ -18,46 +18,57 @@ msgstr "" "Le package \"dials\" doit être installé pour cette fonction. Merci de " "l'installer." +#: dials.R:8 +msgid "Package \"cli\" needed for this function to work. Please install it." +msgstr "" +"Le package \"cli\" doit être installé pour cette fonction. Merci de " +"l'installer." + +#: dials.R:143 +msgid "{.var cat_emb_dim} cannot be used as a {.fun tune} parameter yet." +msgstr "" + #: explain.R:48 #, c-format msgid "`tabnet_explain()` is not defined for a '%s'." msgstr "`tabnet_explain()` n’est pas défini pour un '%s'." -#: hardhat.R:109 +#: hardhat.R:113 #, c-format msgid "`tabnet_fit()` is not defined for a '%s'." msgstr "`tabnet_fit()` n’est pas défini pour un '%s'." -#: hardhat.R:118 hardhat.R:141 hardhat.R:170 +#: hardhat.R:122 hardhat.R:145 hardhat.R:174 #, c-format -msgid "Configured `weights` will not be used" -msgstr "Les `weights` configurés ne seront pas utilisés." +msgid "Configured `weights` variables will not be used as predictors" +msgstr "" +"Les variables `weights` configurées ne seront pas utilisés comme prédicteurs." -#: hardhat.R:309 +#: hardhat.R:317 #, c-format msgid "`tabnet_pretrain()` is not defined for a '%s'." msgstr "`tabnet_pretrain()` n’est pas défini pour un '%s'." -#: hardhat.R:417 +#: hardhat.R:425 #, c-format msgid "'%s' is not recognised as a proper TabNet model" msgstr "'%s' n’est pas reconnu comme un modèle TabNet correct" -#: hardhat.R:424 +#: hardhat.R:432 #, c-format msgid "The model was trained for less than '%s' epochs" msgstr "Le modèle a été entrainé sur moins de '%s' époques" -#: hardhat.R:436 +#: hardhat.R:444 #, c-format msgid "Found missing values in the `%s` outcome column." msgstr "Il y a des valeurs manquantes dans la colonne de résultats `%s`." -#: hardhat.R:446 hardhat.R:561 +#: hardhat.R:454 hardhat.R:569 msgid "Model dimensions don't match." msgstr "Les dimensions ne correspondent pas entre les modèles." -#: hardhat.R:471 +#: hardhat.R:479 #, c-format msgid "" "No model serialized weight can be found in `%s`, check the model history" @@ -65,7 +76,7 @@ msgstr "" "Il n’y a pas de points sérialisés de modèle dans `%s`, veuillez vérifier " "l’historique du modèle" -#: hardhat.R:479 +#: hardhat.R:487 msgid "" "`tabnet_pretrain()` from a model is not currently supported.\n" "The pretraining here will start with a network initialization" @@ -74,34 +85,34 @@ msgstr "" "pour l'instant.\n" "Le pré-entraînement va commencer par une initialisation du réseau." -#: hardhat.R:516 +#: hardhat.R:524 #, c-format msgid "The model was trained for less than `%s` epochs" msgstr "Le modèle a été entrainé sur moins de '%s' époques" -#: hardhat.R:613 +#: hardhat.R:621 #, c-format msgid "Mixed multi-outcome type '%s' is not supported" msgstr "Le type '%s' n’est pas supporté pour des modèles multi-résultat" -#: hardhat.R:621 +#: hardhat.R:629 #, c-format msgid "Unknown outcome type '%s'" msgstr "Le type `%s` est inconnu pour une colonne de résultat" -#: hardhat.R:628 +#: hardhat.R:636 #, c-format msgid "Outcome is factor and the prediction type is '%s'." msgstr "" "La colonne de résultats est catégorielle et la prédiction est de type '%s'." -#: hardhat.R:631 +#: hardhat.R:639 #, c-format msgid "Outcome is numeric and the prediction type is '%s'." msgstr "" "La colonne de résultats est numérique et la prédiction est de type '%s'." -#: hardhat.R:669 +#: hardhat.R:677 msgid "" "The provided hierarchical object is not recognized with a valid format that " "can be checked" @@ -109,7 +120,7 @@ msgstr "" "L’objet hiérarchique fournit n’est pas reconnu dans un format valide qui " "peut être vérifié" -#: hardhat.R:674 +#: hardhat.R:682 #, c-format msgid "" "The attributes or colnames in the provided hierarchical object use the " @@ -155,7 +166,7 @@ msgstr "" msgid "[Epoch %03d] Loss: %3f, Valid loss: %3f" msgstr "" -#: model.R:592 +#: model.R:592 pretraining.R:217 #, c-format msgid "Early stopping at epoch %03d" msgstr "Arrêt anticipé à l’époque %03d" @@ -172,13 +183,17 @@ msgstr "" "aléatoirement à une taille de 1e5. Vous pouvez rendre ce message silencieux " "en configurant l’argument `importance_sample_size`." -#: parsnip.R:460 +#: parsnip.R:465 msgid "" "Package \"parsnip\" needed for this function to work. Please install it." msgstr "" "Le package \"parsnip\" est nécessaire pour exécuter cette fonction, Veuillez " "l'installer." +#: parsnip.R:549 +msgid "parsnip" +msgstr "" + #: pretraining.R:243 #, c-format msgid "" diff --git a/po/R-tabnet.pot b/po/R-tabnet.pot index f22fcde..2114e81 100644 --- a/po/R-tabnet.pot +++ b/po/R-tabnet.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" -"Project-Id-Version: tabnet 0.5.0.9000\n" -"POT-Creation-Date: 2024-02-21 22:37+0100\n" +"Project-Id-Version: tabnet 0.6.0.9000\n" +"POT-Creation-Date: 2024-09-29 08:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,89 +14,97 @@ msgstr "" msgid "Package \"dials\" needed for this function to work. Please install it." msgstr "" +#: dials.R:8 +msgid "Package \"cli\" needed for this function to work. Please install it." +msgstr "" + +#: dials.R:143 +msgid "{.var cat_emb_dim} cannot be used as a {.fun tune} parameter yet." +msgstr "" + #: explain.R:48 #, c-format msgid "`tabnet_explain()` is not defined for a '%s'." msgstr "" -#: hardhat.R:109 +#: hardhat.R:113 #, c-format msgid "`tabnet_fit()` is not defined for a '%s'." msgstr "" -#: hardhat.R:118 hardhat.R:141 hardhat.R:170 +#: hardhat.R:122 hardhat.R:145 hardhat.R:174 #, c-format -msgid "Configured `weights` will not be used" +msgid "Configured `weights` variables will not be used as predictors" msgstr "" -#: hardhat.R:309 +#: hardhat.R:317 #, c-format msgid "`tabnet_pretrain()` is not defined for a '%s'." msgstr "" -#: hardhat.R:417 +#: hardhat.R:425 #, c-format msgid "'%s' is not recognised as a proper TabNet model" msgstr "" -#: hardhat.R:424 +#: hardhat.R:432 #, c-format msgid "The model was trained for less than '%s' epochs" msgstr "" -#: hardhat.R:436 +#: hardhat.R:444 #, c-format msgid "Found missing values in the `%s` outcome column." msgstr "" -#: hardhat.R:446 hardhat.R:561 +#: hardhat.R:454 hardhat.R:569 msgid "Model dimensions don't match." msgstr "" -#: hardhat.R:471 +#: hardhat.R:479 #, c-format msgid "" "No model serialized weight can be found in `%s`, check the model history" msgstr "" -#: hardhat.R:479 +#: hardhat.R:487 msgid "" "`tabnet_pretrain()` from a model is not currently supported.\n" "The pretraining here will start with a network initialization" msgstr "" -#: hardhat.R:516 +#: hardhat.R:524 #, c-format msgid "The model was trained for less than `%s` epochs" msgstr "" -#: hardhat.R:613 +#: hardhat.R:621 #, c-format msgid "Mixed multi-outcome type '%s' is not supported" msgstr "" -#: hardhat.R:621 +#: hardhat.R:629 #, c-format msgid "Unknown outcome type '%s'" msgstr "" -#: hardhat.R:628 +#: hardhat.R:636 #, c-format msgid "Outcome is factor and the prediction type is '%s'." msgstr "" -#: hardhat.R:631 +#: hardhat.R:639 #, c-format msgid "Outcome is numeric and the prediction type is '%s'." msgstr "" -#: hardhat.R:669 +#: hardhat.R:677 msgid "" "The provided hierarchical object is not recognized with a valid format that " "can be checked" msgstr "" -#: hardhat.R:674 +#: hardhat.R:682 #, c-format msgid "" "The attributes or colnames in the provided hierarchical object use the " @@ -134,7 +142,7 @@ msgstr "" msgid "[Epoch %03d] Loss: %3f, Valid loss: %3f" msgstr "" -#: model.R:592 +#: model.R:592 pretraining.R:217 #, c-format msgid "Early stopping at epoch %03d" msgstr "" @@ -147,11 +155,15 @@ msgid "" "message by using the `importance_sample_size` argument." msgstr "" -#: parsnip.R:460 +#: parsnip.R:465 msgid "" "Package \"parsnip\" needed for this function to work. Please install it." msgstr "" +#: parsnip.R:549 +msgid "parsnip" +msgstr "" + #: pretraining.R:243 #, c-format msgid ""