search

Gengrui-Zhang / R2spa

An R Package for Two-Stage Path Analysis (2S-PA)
https://gengrui-zhang.github.io/R2spa/
Other
0 stars 0 forks source link

Interaction functions #82

Closed Gengrui-Zhang closed 1 month ago

Gengrui-Zhang commented 4 months ago

Hi Mark,

I have cleaned my branch and merged the most updated master branch into the interaction branch. The function for creating product indicators with se and loading is named "get_fs_int()". A vignette with the demonstration is also included. Since I want to keep the most relevant information for interactions, I deleted some irrelevant files (but you can let me know if it's inappropriate). The CMD check gave 0 errors, 1 warning, and 3 notes. I have moved many files to a new repo called "2S-PA-Int", and I will develop more interaction-related stuff there. I will invite you to that repo as well, so you can leave some comments. Also, I would like to simplify and improve my other functions, and also make accommodations given the changes to get_fs() and tspa()

Thanks! Jimmy

marklhc commented 4 months ago

Thanks @Gengrui-Zhang. Could you change the destination of merging from master to devel? Also, could you exclude files under the "doc" folder from the PR? Thank you.

Gengrui-Zhang commented 4 months ago

Thanks @Gengrui-Zhang. Could you change the destination of merging from master to devel? Also, could you exclude files under the "doc" folder from the PR? Thank you.

Hi @marklhc , I have changed the destination to devel. As for the "doc" folder, it seems that it does not appear in the devel branch. Do you mean by manually restoring them in my branch?

marklhc commented 4 months ago

@Gengrui-Zhang , it seems that you have deleted many of the files, including the vignettes, in 2fe766cd, and then it looks like you manually restored them in e385367. This is going to cause the file history of those files all gone once we merge things, so I cannot let that happen. I may need to rebase your branch to 2de9e17 and then we go from there.

marklhc commented 4 months ago

And for some reason it looks like you didn't do a merge properly in 2de9e17. I will need to try again

marklhc commented 4 months ago

And please don't manually copy code from other branches to your branch; use a merge commit and resolve conflicts. Please make sure you know how to properly do a merge commit.

Gengrui-Zhang commented 4 months ago

Hii @marklhc, thanks so much for your inspiring comments and practical suggestions. I have addressed all the comments and added test file test-get_fs_int() for this function. Please let me know if you have any questions or further suggestions/comments. Thanks so much!