Skip to content

Commit

Permalink
Fix state issue for Welch/BrownForsyth ANOVA (#2747)
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnnyDoorn authored and AlexanderLyNL committed Aug 25, 2018
1 parent c968533 commit 15fa365
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
4 changes: 1 addition & 3 deletions JASP-Engine/JASP/R/ancova.R
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ Ancova <- function(dataset=NULL, options, perform="run", callback=function(...)

defaults <- c("modelTerms", "dependent", "wlsWeights")
stateKey <- list(
model = c(defaults, "contrasts"),
model = c(defaults, "contrasts", "homogeneityCorrections", "homogeneityNone", "homogeneityBrown", "homogeneityWelch"),
stateContrasts = c(defaults, "contrasts", "contrastAssumeEqualVariance", "confidenceIntervalIntervalContrast", "confidenceIntervalsContrast" ),
statePostHoc = c(defaults, "postHocTestsVariables", "postHocTestsTypeStandard", "postHocTestsTypeDunn", "postHocTestsTypeDunnett",
"postHocTestsTypeGames", "postHocTestsHolm", "postHocTestsScheffe", "postHocTestsTukey", "postHocTestsBonferroni",
Expand Down Expand Up @@ -650,8 +650,6 @@ Ancova <- function(dataset=NULL, options, perform="run", callback=function(...)

if (options$homogeneityCorrections) {

if (length(options$modelTerms) > 1)

if (options$homogeneityNone) {
corrections <- c(corrections, "None")
}
Expand Down
19 changes: 0 additions & 19 deletions Resources/Library/Anova.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,25 +159,6 @@
{
"name": "homogeneityTests",
"type": "Boolean"
},
{
"name": "homogeneityCorrections",
"type": "Boolean"
},
{
"name": "homogeneityNone",
"type": "Boolean",
"default": true
},
{
"name": "homogeneityWelch",
"type": "Boolean",
"default": true
},
{
"name": "homogeneityBrown",
"type": "Boolean",
"default": true
},
{
"name": "homogeneityCorrections",
Expand Down

0 comments on commit 15fa365

Please sign in to comment.