New distributions and historical parameters

DESCRIPTION

@@ -37,7 +37,8 @@ Imports:
   tibble,
   vipor,
   weibullness,
-  utils
+  utils,
+  flexsurv
 Remotes:
   jasp-stats/jaspBase,
   jasp-stats/jaspDescriptives,

R/doeAnalysis.R

@@ -1693,7 +1693,9 @@ get_levels <- function(var, num_levels, dataset) {
       return()
     }
     result <- jaspResults[[dep]][["doeResult"]]$object[["regression"]]
-    plot$plotObject <- jaspGraphs::plotQQnorm(resid(result[["object"]]), abline = TRUE) + ggplot2::scale_x_continuous(expand = ggplot2::expansion(mult = 0.1)) + ggplot2::scale_y_continuous(expand = ggplot2::expansion(mult = 0.1))
+    plot$plotObject <- jaspGraphs::plotQQnorm(resid(result[["object"]]), abline = TRUE) +
+      ggplot2::scale_x_continuous(expand = ggplot2::expansion(mult = 0.1), name = gettext("Theoretical quantiles")) +
+      ggplot2::scale_y_continuous(expand = ggplot2::expansion(mult = 0.1), name = gettext("Observed quantiles"))
   }
 }
 

inst/help/processCapabilityStudies.md

@@ -46,9 +46,10 @@ The size of the subgroups is relevant for the calculation of the process varianc
 - **Continuity Adjustment** if enabled, the Box-Cox transform includes the adjustment term $y = \frac{(x+\text{shift})^\lambda-1}{\lambda}$.
 
 #### Type of data distribution
-- Type of data distribution: indicate whether the data approximates a normal distribution or another distribution (the most commonly used distributions are: Weibull, Lognormal, 3-parameter Weibull, and 3-parameter lognorma)
+- Type of data distribution: indicate whether the data approximates a normal distribution or another distribution (the available distributions are: Weibull, Lognormal, Gamma, Exponential, Logistic, Log-logistic, 3-parameter Weibull, and 3-parameter lognormal)
     - Specify a distribution: the non-normal distribution to be used. 
     - Non-normal capability statistics: the method used to calculate the capability statistics for non-normally distributed data.
+    - Historical parameters: Select which parameters should use fixed historical values instead of being estimated. Note that if not all parameters are set historically, JASP keeps the historical parameters fixed while estimating the remaining parameters freely.
 
 #### Capability studies
 - Specification limits:

inst/qml/processCapabilityStudies.qml

@@ -273,6 +273,41 @@ Form
 						id : 				normalCapabilityAnalysis
 						label: 				qsTr("Normal distribution")
 						checked: 			true
+
+
+						CheckBox
+						{
+							name: 						"historicalMean"
+							label: 						qsTr("Historical mean")
+							id:							historicalMean
+							childrenOnSameRow:			true
+
+							DoubleField
+							{
+								name: 					"historicalMeanValue"
+								id:						historicalMeanValue
+								negativeValues:			true
+								defaultValue:			0
+								decimals:				9
+							}
+						}
+
+						CheckBox
+						{
+							name: 						"historicalStdDev"
+							label: 						qsTr("Historical std. dev.")
+							id:							historicalStdDev
+							childrenOnSameRow:			true
+
+							DoubleField
+							{
+								name: 					"historicalStdDevValue"
+								id:						historicalStdDevValue
+								negativeValues:			true
+								defaultValue:			1
+								decimals:				9
+							}
+						}
 					}
 
 					RadioButton
@@ -289,13 +324,125 @@ Form
 							values:
 							[
 								{label: qsTr("Weibull"),					value: "weibull"},
-								{label: qsTr("Lognormal"),					value: "lognormal"},
+								{label: qsTr("Log-normal"),					value: "lognormal"},
+								{label: qsTr("Gamma"),						value: "gamma"},
+								{label: qsTr("Exponential"),				value: "exponential"},
+								{label: qsTr("Logistic"),					value: "logistic"},
+								{label: qsTr("Log-logistic"),				value: "loglogistic"},
 								{label: qsTr("3-parameter Weibull"),		value: "3ParameterWeibull"},
-								{label: qsTr("3-parameter lognormal"),		value: "3ParameterLognormal"}
+								{label: qsTr("3-parameter log-normal"),		value: "3ParameterLognormal"}
 							]
 							indexDefaultValue: 0
 						}
 
+						CheckBox
+						{
+							name: 						"historicalShape"
+							label: 						qsTr("Historical shape")
+							id:							historicalShape
+							childrenOnSameRow:			true
+							visible:					nonNormalDistribution.currentValue == "weibull" || nonNormalDistribution.currentValue == "3ParameterWeibull" || nonNormalDistribution.currentValue == "gamma"
+
+							DoubleField
+							{
+								name: 					"historicalShapeValue"
+								id:						historicalShapeValue
+								negativeValues:			true
+								defaultValue:			1
+								decimals:				9
+							}
+						}
+
+						CheckBox
+						{
+							name: 						"historicalLocation"
+							label: 						qsTr("Historical location")
+							id:							historicalLocation
+							childrenOnSameRow:			true
+							visible:					nonNormalDistribution.currentValue == "logistic" || nonNormalDistribution.currentValue == "loglogistic"
+
+							DoubleField
+							{
+								name: 					"historicalLocationValue"
+								id:						historicalLocationValue
+								negativeValues:			true
+								defaultValue:			1
+								decimals:				9
+							}
+						}
+
+						CheckBox
+						{
+							name: 						"historicalScale"
+							label: 						qsTr("Historical scale")
+							id:							historicalScale
+							childrenOnSameRow:			true
+							visible:					nonNormalDistribution.currentValue == "weibull" || nonNormalDistribution.currentValue == "3ParameterWeibull" || nonNormalDistribution.currentValue == "gamma" ||  nonNormalDistribution.currentValue == "exponential" || nonNormalDistribution.currentValue == "logistic" || nonNormalDistribution.currentValue == "loglogistic"
+
+							DoubleField
+							{
+								name: 					"historicalScaleValue"
+								id:						historicalScaleValue
+								negativeValues:			true
+								defaultValue:			1
+								decimals:				9
+							}
+						}
+
+						CheckBox
+						{
+							name: 						"historicalLogMean"
+							label: 						qsTr("Historical log mean")
+							id:							historicalLogMean
+							childrenOnSameRow:			true
+							visible:					nonNormalDistribution.currentValue == "lognormal" || nonNormalDistribution.currentValue == "3ParameterLognormal"
+
+							DoubleField
+							{
+								name: 					"historicalLogMeanValue"
+								id:						historicalLogMeanValue
+								negativeValues:			true
+								defaultValue:			1
+								decimals:				9
+							}
+						}
+
+						CheckBox
+						{
+							name: 						"historicalLogStdDev"
+							label: 						qsTr("Historical log std. dev.")
+							id:							historicalLogStdDev
+							childrenOnSameRow:			true
+							visible:					nonNormalDistribution.currentValue == "lognormal" || nonNormalDistribution.currentValue == "3ParameterLognormal"
+
+							DoubleField
+							{
+								name: 					"historicalLogStdDevValue"
+								id:						historicalLogStdDevValue
+								negativeValues:			true
+								defaultValue:			1
+								decimals:				9
+							}
+						}
+
+						CheckBox
+						{
+							name: 						"historicalThreshold"
+							label: 						qsTr("Historical threshold")
+							id:							historicalThreshold
+							childrenOnSameRow:			true
+							visible:					nonNormalDistribution.currentValue == "3ParameterLognormal" || nonNormalDistribution.currentValue == "3ParameterWeibull"
+
+							DoubleField
+							{
+								name: 					"historicalThresholdValue"
+								id:						historicalThresholdValue
+								negativeValues:			true
+								defaultValue:			1
+								decimals:				9
+							}
+						}
+
 						DropDown
 						{
 							name:					"nonNormalMethod"
@@ -809,13 +956,29 @@ Form
 				label: 					qsTr("Null distribution for probability plot")
 				values: 
 				[
-					{ label: qsTr("Normal"),		value: "normal"		},
-					{ label: qsTr("Lognormal"),		value: "lognormal"	},
-					{ label: qsTr("Weibull"),		value: "weibull"	}
+					{ label: qsTr("Normal"),		         value: "normal"		},
+					{ label: qsTr("Log-normal"),	         value: "lognormal"	},
+					{ label: qsTr("Weibull"),		         value: "weibull"	},
+					{ label: qsTr("Gamma"),			         value: "gamma"		},
+					{ label: qsTr("Exponential"),	         value: "exponential"},
+					{ label: qsTr("Logistic"),		         value: "logistic"	},
+					{ label: qsTr("Log-logistic"),	         value: "loglogistic"},
+					{ label: qsTr("3-parameter Weibull"),    value: "3ParameterWeibull"},
+					{ label: qsTr("3-parameter log-normal"), value: "3ParameterLognormal"}
+
+
+
+
 				]
 				indexDefaultValue: (capabilityStudyType.value == "nonNormalCapabilityAnalysis") ? 
-				(nonNormalDistribution.currentValue == "lognormal" || nonNormalDistribution.currentValue == "3ParameterLognormal") ? 1 : 
-				(nonNormalDistribution.currentValue == "3ParameterWeibull" || nonNormalDistribution.currentValue == "weibull") ? 2 : 0 
+				(nonNormalDistribution.currentValue == "lognormal") ? 1 : 
+				(nonNormalDistribution.currentValue == "weibull") ? 2 :
+				(nonNormalDistribution.currentValue == "gamma") ? 3 :
+				(nonNormalDistribution.currentValue == "exponential") ? 4 :
+				(nonNormalDistribution.currentValue == "logistic") ? 5 :
+				(nonNormalDistribution.currentValue == "loglogistic") ? 6 :
+				(nonNormalDistribution.currentValue == "3ParameterWeibull") ? 7 :
+				(nonNormalDistribution.currentValue == "3ParameterLognormal") ? 8 : 0
 				: 0
 			}