Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preload data #5667

Merged
merged 5 commits into from
Sep 30, 2024
Merged

Preload data #5667

merged 5 commits into from
Sep 30, 2024

Conversation

JorisGoosen
Copy link
Contributor

@JorisGoosen JorisGoosen commented Sep 17, 2024

Also merge: jasp-stats/jaspColumnEncoder#9 and jasp-stats/jaspBase#152
Ive also made some small changes to jaspDescriptives: jasp-stats/jaspDescriptives#314

for jasp-stats/INTERNAL-jasp#2583

Don't forget git submodule update ;)

This adds support for automatic preloading of data for analyses. By default Ive turned it off to ease the transition but ideally that would be on. This is done through the preloadData property on Description and Analysis in Description.qml.
If disabled it will act like 0.19(.1). Basically adding an "optionname.types" and flattening "optionname" option into just the names.

It encodes all the columnname-options to their columnname+requested type if they have one. (Which is the case for the variableslists etc). And then gives the analysis a flat list of encoded columnnames that will refer to the column in the dataset with the specific version of the data requested.

There is now also jaspRcpp support for the columnencoder where it can give the type back. This has not been implemented all the way to R though.

The confusing "Keeping types" and "Converting types" button in computed column window has now been removed.
This because the columns in filterconstructor and computed columnconstructor now have support for transforming their datatype locally (including showing the preview a la variables list).
This is also available in R-code as "V1.ordinal" etc.
The syntaxhighlighting will also help indicate this.

@JorisGoosen
Copy link
Contributor Author

JAGS en SEM are not supported properly

@vandenman
Copy link
Contributor

Specifically, no support for:

  • .readDataSetToEnd(all.columns = TRUE).
  • analyses whose columns are determined by parsing a TextArea.

@JorisGoosen
Copy link
Contributor Author

Im currently finishing support for changing type with dropdown in filterconstructor.

Then I need to add a property to modules and analyses that states "I can handle datasets being passed as an argument" aka "preloadData" or something.

And further I want to remove the "keeping types" and "converting types" cause it really isnt necessary anymore.

@JorisGoosen JorisGoosen force-pushed the preloadData branch 2 times, most recently from 235ad8f to 1466cf6 Compare September 26, 2024 11:54
@JorisGoosen
Copy link
Contributor Author

All the changes have been made, Ill update the PR description to reflect the changes.

@boutinb
Copy link
Contributor

boutinb commented Sep 27, 2024

It works nearly perfect. But now if I close the Variable Window, it says nearly always "Would you like to save your changes to the Computed Column":
. If I just add a new (not computed) column, and I click on the red cross icon, I get this message.
. If I open a computed column, change something and compute the column, if I close the variables window, I get this message. I can the 'Apply' or 'Discard' : if I open the Variable Window and close it just afterwards I get the same message.

The computed column help should be updated.

…r each analysis

Implements jasp-stats/INTERNAL-jasp#2583

Has corresponding changes in jaspBase, jaspModuleEncoder and jaspDescriptives

fix some merge errors and bugs

add syntaxhighlighting to computecolumn R display

move focus to button on apply filter so text-entry is editFinished

columntype in filterconstructor now follows dataset changes

filterconstructor now has changeable columntypes!

force active focus on apply button in filter and comp col to focus out of constructor and trigger proper checks

remove last remnants of "keeping/converting columntypes"

started work on preloading data config in Description.qml

Add preloadData argument to analysisrunflow and decode to type
@JorisGoosen
Copy link
Contributor Author

The help is updated and the apply thing should now only bother you when you made changes ;)

@boutinb
Copy link
Contributor

boutinb commented Sep 30, 2024

@vandenman Do you have time to review this PR today?

Copy link
Contributor

@vandenman vandenman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not looked at the code in depth, but I did try this out and it build and worked fine.

@JorisGoosen JorisGoosen merged commit 62b9544 into development Sep 30, 2024
1 check failed
@JorisGoosen JorisGoosen deleted the preloadData branch September 30, 2024 10:25
JorisGoosen added a commit that referenced this pull request Sep 30, 2024
* Encode types of variables into their encoded names to preload data for each analysis

Implements jasp-stats/INTERNAL-jasp#2583

Has corresponding changes in jaspBase, jaspModuleEncoder and jaspDescriptives

fix some merge errors and bugs

add syntaxhighlighting to computecolumn R display

move focus to button on apply filter so text-entry is editFinished

columntype in filterconstructor now follows dataset changes

filterconstructor now has changeable columntypes!

force active focus on apply button in filter and comp col to focus out of constructor and trigger proper checks

remove last remnants of "keeping/converting columntypes"

started work on preloading data config in Description.qml

Add preloadData argument to analysisrunflow and decode to type

* set default off for preloadData

* fix annoying "computed column changed wanna save" popping up too much

* add some info on type changing in computed column help

* add some info on changing types to filter help
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants