Add types in formula #5728
Merged
Add types in formula #5728
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JorisGoosen
force-pushed
the
addTypesInFormula
branch
from
27aaf93 to
e1d6f31
Compare
And there is no need to escape the columnName.type just for the dot, dots are normal parts of names in R |
boutinb
force-pushed
the
addTypesInFormula
branch
from
e49fdff to
decd3c0
Compare
|
@JorisGoosen This is ready to be tested. |
JorisGoosen
reviewed
Nov 11, 2024
| @@ -50,6 +50,7 @@ class ColumnTypesModel : public QAbstractListModel | |||
| void setTypes(columnTypeVec types); | |||
| bool hasType(columnType type) const; | |||
| bool hasAllTypes() const; | |||
| bool hasMandatoryType() const; | |||
There was a problem hiding this comment.
wat is een mandatory type precies?
JorisGoosen
reviewed
Nov 11, 2024
|
|
||
| Json::Value ListModel::getVariableTypes(const Terms& terms, bool onlyChanged) const | ||
| { | ||
| if (onlyChanged && _listView->hasMandatoryType()) // Don't need to ask for the changed types: this avoids to add the type in formula when it is not necessary |
JorisGoosen
reviewed
Nov 11, 2024
JorisGoosen
approved these changes
Nov 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The formula in R Syntax should add the the types of the variables (if they are changed):
formula = ~ contNormal + contBinom.scaleThe generation of the formula and the parsing of the formula should be then adapted for this.
Fixes jasp-stats/jasp-issues#2990
Also the R wrappers are updated (hopefully thanks to the R Syntax project, the generation of the wrappers will be automated!)
To test it: