Skip to content

Commit 34f2910

Browse files
KucharssimKucharssim
committed
add auto transforms to computed columns window
1 parent 975a207 commit 34f2910

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

‎Common/r_functionwhitelist.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const std::set<std::string> R_FunctionWhiteList::functionWhiteList {
3636
"attr",
3737
"attributes",
3838
"BoxCox",
39+
"BoxCoxAuto",
3940
"binom.test",
4041
"by",
4142
"c",
@@ -137,6 +138,7 @@ const std::set<std::string> R_FunctionWhiteList::functionWhiteList {
137138
"pmin",
138139
"poly",
139140
"powerTransform",
141+
"powerTransformAuto",
140142
"power.t.test",
141143
"predict",
142144
"print",
@@ -220,6 +222,7 @@ const std::set<std::string> R_FunctionWhiteList::functionWhiteList {
220222
"which.min",
221223
"xtabs",
222224
"YeoJohnson",
225+
"YeoJohnsonAuto",
223226
".setColumnDataAsScale", ".setColumnDataAsOrdinal", ".setColumnDataAsNominal", ".setColumnDataAsNominalText",
224227

225228
"function", "stop",

‎Desktop/components/JASP/Widgets/ComputeColumnWindow.qml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -196,19 +196,23 @@ FocusScope
196196

197197

198198
ListElement { type: "separator" }
199-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "log"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("natural logarithm") }
200-
ListElement { type: "function"; friendlyFunctionName: "log\u2082"; functionName: "log2"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("base 2 logarithm") }
201-
ListElement { type: "function"; friendlyFunctionName: "log\u2081\u2080"; functionName: "log10"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("base 10 logarithm") }
202-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "logb"; functionParameters: "y,base"; functionParamTypes: "number,number"; toolTip: qsTr("logarithm of y in 'base'") }
203-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "exp"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("exponential") }
204-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "fishZ"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Fisher's Z-transform (i.e., the inverse hyperbolic tangent) to transform correlations, numbers between -1 and 1 to the real line") }
205-
ListElement { type: "function"; friendlyFunctionName: "fishZ\u207B\u00B9"; functionName: "invFishZ"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Inverse Fisher's Z-transform (i.e., the hyperbolic tangent) to transform real numbers to numbers between -1 and 1") }
206-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "logit"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Logit transform (i.e., the inverse of the standard logit function, or log-odds transform) converts numbers between 0 and 1 to the real line.") }
207-
ListElement { type: "function"; friendlyFunctionName: "logit\u207B\u00B9"; functionName: "invLogit"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Inverse logit transform (i.e., the standard logit function) converts numbers on the real line to numbers between 0 and 1.") }
208-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "BoxCox"; functionParameters: "y,lambda,shift"; functionParamTypes: "number,number,number"; toolTip: qsTr("Two-parameter Box-Cox transform (transforms values greater than -shift) to stabilize variance and attempt to make the data more normal distribution-like.") }
209-
ListElement { type: "function"; friendlyFunctionName: "BoxCox\u207B\u00B9"; functionName: "invBoxCox"; functionParameters: "y,lambda,shift"; functionParamTypes: "number,number,number"; toolTip: qsTr("Inverse two-parameter Box-Cox transform.") }
210-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "powerTransform"; functionParameters: "y,lambda,shift"; functionParamTypes: "number,number,number"; toolTip: qsTr("Two-parameter power transform (transforms values greater than -shift) to stabilize variance and attempt to make the data more normal distribution-like.") }
211-
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "YeoJohnson"; functionParameters: "y,lambda"; functionParamTypes: "number,number"; toolTip: qsTr("Yeo-Johnson transform (transforms any real values) to stabilize variance and attempt to make the data more normal distribution-like.") }
199+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "log"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("natural logarithm") }
200+
ListElement { type: "function"; friendlyFunctionName: "log\u2082"; functionName: "log2"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("base 2 logarithm") }
201+
ListElement { type: "function"; friendlyFunctionName: "log\u2081\u2080"; functionName: "log10"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("base 10 logarithm") }
202+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "logb"; functionParameters: "y,base"; functionParamTypes: "number,number"; toolTip: qsTr("logarithm of y in 'base'") }
203+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "exp"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("exponential") }
204+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "fishZ"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Fisher's Z-transform (i.e., the inverse hyperbolic tangent) to transform correlations, numbers between -1 and 1 to the real line") }
205+
ListElement { type: "function"; friendlyFunctionName: "fishZ\u207B\u00B9"; functionName: "invFishZ"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Inverse Fisher's Z-transform (i.e., the hyperbolic tangent) to transform real numbers to numbers between -1 and 1") }
206+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "logit"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Logit transform (i.e., the inverse of the standard logit function, or log-odds transform) converts numbers between 0 and 1 to the real line.") }
207+
ListElement { type: "function"; friendlyFunctionName: "logit\u207B\u00B9"; functionName: "invLogit"; functionParameters: "y"; functionParamTypes: "number"; toolTip: qsTr("Inverse logit transform (i.e., the standard logit function) converts numbers on the real line to numbers between 0 and 1.") }
208+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "BoxCox"; functionParameters: "y,lambda,shift"; functionParamTypes: "number,number,number"; toolTip: qsTr("Two-parameter Box-Cox transform (transforms values greater than -shift) to stabilize variance and attempt to make the data more normal distribution-like.") }
209+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "BoxCoxAuto"; functionParameters: "y,method,lower,upper,shift"; functionParamTypes: "number,string,number,number,number"; toolTip: qsTr("Two-parameter Box-Cox transform with an automatic determination of the shape parameter lambda, according to one of the two of methods:'loglik' or 'minitab'. The search for optimal lambda is bounded within 'lower' and 'upper' limits.") }
210+
ListElement { type: "function"; friendlyFunctionName: "BoxCox\u207B\u00B9"; functionName: "invBoxCox"; functionParameters: "y,lambda,shift"; functionParamTypes: "number,number,number"; toolTip: qsTr("Inverse two-parameter Box-Cox transform.") }
211+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "powerTransform"; functionParameters: "y,lambda,shift"; functionParamTypes: "number,number,number"; toolTip: qsTr("Two-parameter power transform (scale-invariant Box-Box; transforms values greater than -shift) to stabilize variance and attempt to make the data more normal distribution-like.") }
212+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "powerTransformAuto"; functionParameters: "y,lower,upper,shift"; functionParamTypes: "number,number,number,number"; toolTip: qsTr("Two-parameter power transform with an automatic determination of the shape parameter lambda. The search for optimal lambda is bounded within 'lower' and 'upper' limits.") }
213+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "YeoJohnson"; functionParameters: "y,lambda"; functionParamTypes: "number,number"; toolTip: qsTr("Yeo-Johnson transform (transforms any real values) to stabilize variance and attempt to make the data more normal distribution-like.") }
214+
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "YeoJohnsonAuto"; functionParameters: "y,lower,upper"; functionParamTypes: "number,number,number"; toolTip: qsTr("Yeo-Johnson transform (transforms any real values) with an automatic determination of the shape parameter lambda. The search for optimal lambda is bounded within 'lower' and 'upper' limits.") }
215+
212216

213217
ListElement { type: "separator" }
214218
ListElement { type: "function"; friendlyFunctionName: ""; functionName: "cut"; functionParameters: "values,numBreaks"; functionParamTypes: "number,number"; toolTip: qsTr("break your data up in numBreaks levels") }

0 commit comments

Comments
 (0)