diff --git a/paper/aaai/appendix.pdf b/paper/aaai/appendix.pdf index fd56491b17ec180e86a67563fcf6111656473121..326bb5c7df23dff80206a492daec58b35c261dd2 100644 Binary files a/paper/aaai/appendix.pdf and b/paper/aaai/appendix.pdf differ diff --git a/paper/aaai/author_response.pdf b/paper/aaai/author_response.pdf index f61a726109859b196732886798fdcca7d0ed8d93..e0e391dd23a90763820e3eedb5305c471ce36904 100644 Binary files a/paper/aaai/author_response.pdf and b/paper/aaai/author_response.pdf differ diff --git a/paper/aaai/paper.pdf b/paper/aaai/paper.pdf index ecae41966a688773c24aab28ccede10358b56387..1e121bd690f9d84cda2a139a8310a8feda44612f 100644 Binary files a/paper/aaai/paper.pdf and b/paper/aaai/paper.pdf differ diff --git a/paper/contents/table_gen_params.tex b/paper/contents/table_gen_params.tex index 94e6b2ac0bb6087d2748619cc15fa2db0b5b4d75..9f4eb5969df50420a42e3d751dbeaf02caddd403 100644 --- a/paper/contents/table_gen_params.tex +++ b/paper/contents/table_gen_params.tex @@ -1,20 +1,20 @@ \begin{table} -\caption{Generator hyperparameters. \label{tab:genparams} \newline} +\caption{Generator hyperparameters: the optimiser step size ($\eta$); penalty strengths where $\lambda_1$ applies to all generators but \textit{Schut} and the other parameter are specific to \textit{ECCCo}; finally, the strength for the Ridge penalty on energy for \textit{ECCCo}.\label{tab:genparams} \newline} \centering \fontsize{8}{10}\selectfont -\begin{tabular}[t]{rrrrr} +\begin{tabular}[t]{rrrrrr} \toprule -Dataset & $\eta$ & $\lambda_1$ & $\lambda_2$ & $\lambda_3$\\ +Dataset & $\eta$ & $\lambda_1$ & $\lambda_2$ & $\lambda_3$ & Ridge penalty\\ \midrule -Linearly Separable & 0.01 & 0.10 & 0.10 & 0.05\\ -Moons & 0.01 & 0.10 & 0.10 & 0.50\\ -Circles & 0.05 & 0.10 & 0.10 & 0.05\\ -California Housing & 0.05 & 0.10 & 0.10 & 0.10\\ -GMSC & 0.05 & 0.10 & 0.10 & 0.10\\ -German Credit & 0.05 & 0.20 & 0.20 & 0.20\\ -MNIST & 0.10 & 0.01 & 0.25 & 0.25\\ -Fashion MNIST & 0.10 & 0.01 & 0.25 & 0.25\\ +Linearly Separable & 0.01 & 0.10 & 0.1 & 0.05 & 0.0\\ +Moons & 0.01 & 0.10 & 0.1 & 0.50 & 0.0\\ +Circles & 0.05 & 0.10 & 0.1 & 0.05 & 1.0\\ +California Housing & 0.05 & 0.10 & 0.1 & 0.10 & 0.0\\ +GMSC & 0.05 & 0.10 & 0.1 & 0.10 & 0.0\\ +German Credit & 0.05 & 0.20 & 0.2 & 0.20 & 0.5\\ +MNIST & 0.10 & 0.01 & 0.1 & 0.30 & 0.0\\ +Fashion MNIST & 0.10 & 0.01 & 0.1 & 0.30 & 0.0\\ \bottomrule \end{tabular} \end{table} diff --git a/paper/tables.Rmd b/paper/tables.Rmd index 21cde35abedea2075f31443e128f1d4a9c9e0a7c..a80825d271a0df27fb317f97b810f6fddcafad07 100644 --- a/paper/tables.Rmd +++ b/paper/tables.Rmd @@ -580,15 +580,16 @@ dt <- lapply(files[sapply(files, function(x) grepl("generator_params.csv",x))], fread(file.path(paste0(res_path,"params"), x)) }) dt <- Reduce(function(x,y) {rbind(x,y, fill=TRUE)}, dt) -dt <- dt[,.(dataname,eta,lambda_1,lambda_2,lambda_3)] +dt[is.na(reg_strength),reg_strength:=0] +dt <- dt[,.(dataname,eta,lambda_1_Δ,lambda_2_Δ,lambda_3_Δ,reg_strength)] dt[,dataname:=factor(dataname, levels=dataset_order)] dt <- dt[order(dataname)] col_names <- c( "Dataset", - "$\\eta$", "$\\lambda_1$", "$\\lambda_2$", "$\\lambda_3$" + "$\\eta$", "$\\lambda_1$", "$\\lambda_2$", "$\\lambda_3$", "Ridge penalty" ) kbl( - dt, caption = "Generator hyperparameters. \\label{tab:genparams} \\newline", + dt, caption = "Generator hyperparameters: the optimiser step size ($\\eta$); penalty strengths where $\\lambda_1$ applies to all generators but \\textit{Schut} and the other parameter are specific to \\textit{ECCCo}; finally, the strength for the Ridge penalty on energy for \\textit{ECCCo}.\\label{tab:genparams} \\newline", align = "r", col.names=col_names, booktabs = T, escape=F, format="latex", linesep = "" ) %>%