From adbe9d029196a9e33e2239be71467c69b64655a0 Mon Sep 17 00:00:00 2001
From: JTPetter <61797391+JTPetter@users.noreply.github.com>
Date: Mon, 15 Apr 2024 16:14:35 +0200
Subject: [PATCH] Fix dependencies and remove testing code

---
 R/doeAnalysis.R | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/R/doeAnalysis.R b/R/doeAnalysis.R
index cd7b28ca..b63c9cd5 100644
--- a/R/doeAnalysis.R
+++ b/R/doeAnalysis.R
@@ -104,7 +104,8 @@ doeAnalysis <- function(jaspResults, dataset, options, ...) {
     "dependentResponseSurface", "fixedFactorsResponseSurface", "blocksResponseSurface", "runOrder",
     "highestOrder", "order", "continuousFactorsFactorial", "modelTerms", "blocksFactorial",
     "designType", "continuousFactorsResponseSurface", "codeFactors", "rsmPredefinedModel", "fixedFactorsFactorial",
-    "rsmPredefinedTerms", "dependentFactorial")
+    "rsmPredefinedTerms", "dependentFactorial", "covariates", "codeFactorsMethod", "codeFactorsManualTable",
+    "squaredTerms", "sumOfSquaresType", "squaredTermsCoded")
   return(deps)
 }
 
@@ -365,16 +366,6 @@ doeAnalysis <- function(jaspResults, dataset, options, ...) {
   discretePredictorsIndices <- which(termNamesRemoved %in% discretePredictors)
   nDiscretePredictorLevels <- sapply(discretePredictors, function(x) sum(termNamesRemoved == x))
 
-  # # append number if duplicated
-  # for(term_k in seq_along(termNames)) {
-  #   n_occurences <- sum(termNames == termNames[term_k])
-  #   if (n_occurences > 1) {
-  #     term_indices <- which(termNames == termNames[term_k])
-  #     termNames[term_indices] <- paste0(termNames[term_k], seq_len(n_occurences))
-  #   }
-  # }
-
-
   # Coded terms never have appended factor levels, so just remove whitespace
   termNames <- gsub("\\s", "", termNames)
   termNamesCoded <- gsub("\\s", "", termNamesCoded)
@@ -843,7 +834,7 @@ get_levels <- function(var, num_levels, dataset) {
     return()
   }
   plot <- createJaspPlot(title = gettext("Histogram of Residuals"), width = 500, height = 500)
-  plot$dependOn(options = c("plotHist", .doeAnalysisBaseDependencies()))
+  plot$dependOn(options = c("plotHist", "histogramBinWidthType", "histogramManualNumberOfBins", .doeAnalysisBaseDependencies()))
   plot$position <- 8
   jaspResults[["plotHist"]] <- plot
   if (!ready || is.null(jaspResults[["doeResult"]]) || jaspResults$getError()) {