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

Merge newitcv_uncond #95

Merged
merged 6 commits into from
Nov 11, 2024
Merged

Merge newitcv_uncond #95

merged 6 commits into from
Nov 11, 2024

Conversation

JihoonChoi26
Copy link
Collaborator

  1. Edit the order of rxcv and rycv
  2. Resolve sign error of ITCV
  3. Add "interchangeable if they are different" for different sign of rxcv(Gz) and rycv(Gz)
  4. Add rxcvGz and rycvGz descriptions in the read file

show unconditional output if user defined sdx, sdy, r2
Change from pre-defined uncond_rxcv, rycv to NA
1. Edit the order of rxcv and rycv
2. Resolve sign error of ITCV
1. If sign of rxcv equates to rycv, then sign_interchangeable is "fixed", if not, "interchangeable".
2. If sign of rxcvGz equates to rycvGz, then sign_cond_interchangeable is "fixed", if not, "interchangeable".
Delete "request raw output" due to the addition of printed output for unconditional ITCV.
1. Changed to "interchangeable if they are different"
2. Add rxcvGz and rycvGz description in the read file
@qinyun-lin qinyun-lin marked this pull request as ready for review November 11, 2024 19:08
@qinyun-lin qinyun-lin merged commit 2b40bf5 into master Nov 11, 2024
8 checks passed
qinyun-lin added a commit that referenced this pull request Nov 19, 2024
* update the documentation for needtworows as a raw output

* udpate readme to include ITCV

* update

* cran submit

* news update

* updates to vignette and site

* update pkgdown site to organize reference

* minor edits to DESCRIPTION

* minor edits for 1.0.2

* Merge newitcv_uncond (#95)

* Add printed output for uncond ITCV

show unconditional output if user defined sdx, sdy, r2

* Small edit for rxcv and rycv

Change from pre-defined uncond_rxcv, rycv to NA

* Unconditional ITCV edit

1. Edit the order of rxcv and rycv
2. Resolve sign error of ITCV

* Add sign_interchangeable

1. If sign of rxcv equates to rycv, then sign_interchangeable is "fixed", if not, "interchangeable".
2. If sign of rxcvGz equates to rycvGz, then sign_cond_interchangeable is "fixed", if not, "interchangeable".

* Update helper_output_print.R

Delete "request raw output" due to the addition of printed output for unconditional ITCV.

* Printed Output Edit

1. Changed to "interchangeable if they are different"
2. Add rxcvGz and rycvGz description in the read file

* Update NEWS.md

* Update NEWS.md

* Update DESCRIPTION (1.0.3 for github version)

* Update NEWS.md

update updates in 1.0.3

---------

Co-authored-by: Joshua Rosenberg <jmrosen48@gmail.com>
Co-authored-by: Jihoon_Choi <50298939+JihoonChoi26@users.noreply.github.com>
Co-authored-by: Joshua Rosenberg <jmrosenberg@utk.edu>
qinyun-lin added a commit that referenced this pull request Nov 27, 2024
* merge in changes from master branch  (#93)

* update the documentation for needtworows as a raw output

* udpate readme to include ITCV

* Create test_cRIR.R

* Update pkonfound.R

for cRIR

* recover pkonfound from the master branch

* Update pkonfound.R

Add cRIR

* notes for output cRIR

* reformat output for cRIR

includes both raw output and print outout.

* update print output for cRIR

* pull in updates from master branch  (#96)

* update the documentation for needtworows as a raw output

* udpate readme to include ITCV

* update

* cran submit

* news update

* updates to vignette and site

* update pkgdown site to organize reference

* minor edits to DESCRIPTION

* minor edits for 1.0.2

* Merge newitcv_uncond (#95)

* Add printed output for uncond ITCV

show unconditional output if user defined sdx, sdy, r2

* Small edit for rxcv and rycv

Change from pre-defined uncond_rxcv, rycv to NA

* Unconditional ITCV edit

1. Edit the order of rxcv and rycv
2. Resolve sign error of ITCV

* Add sign_interchangeable

1. If sign of rxcv equates to rycv, then sign_interchangeable is "fixed", if not, "interchangeable".
2. If sign of rxcvGz equates to rycvGz, then sign_cond_interchangeable is "fixed", if not, "interchangeable".

* Update helper_output_print.R

Delete "request raw output" due to the addition of printed output for unconditional ITCV.

* Printed Output Edit

1. Changed to "interchangeable if they are different"
2. Add rxcvGz and rycvGz description in the read file

* Update NEWS.md

* Update NEWS.md

* Update DESCRIPTION (1.0.3 for github version)

* Update NEWS.md

update updates in 1.0.3

---------

Co-authored-by: Joshua Rosenberg <jmrosen48@gmail.com>
Co-authored-by: Jihoon_Choi <50298939+JihoonChoi26@users.noreply.github.com>
Co-authored-by: Joshua Rosenberg <jmrosenberg@utk.edu>

* fix errors after simulation verification

1. double check with Ken cal_ryz does not need sdx and sdy
2. sustain scenarios are not considered for fixed value and null distribution

* update message

1. explain rxy given z
2. for sustain cases for null distribution or fixed value give info that the calculation is under development.

---------

Co-authored-by: konfound <142321835+zgfei-918@users.noreply.github.com>
Co-authored-by: Joshua Rosenberg <jmrosen48@gmail.com>
Co-authored-by: Jihoon_Choi <50298939+JihoonChoi26@users.noreply.github.com>
Co-authored-by: Joshua Rosenberg <jmrosenberg@utk.edu>
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.

2 participants