Minor adjustments #32
Merged
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
Merge branch 'MinorAdjustments' of https://github.com/martin-gmx/PopED into MinorAdjustments # Conflicts: # tests/testthat/examples_fcn_doc/examples_RS_opt.R
|
Added some further refactoring to simplify the code - to later be able to add speedup and other methods for faster derivative calculations. |
R/get_cv.R
Outdated
| @@ -142,7 +146,7 @@ get_rse <- function (fim, poped.db, | |||
| params_rse <- returnArgs[[2]] | |||
| parnam <- get_parnam(poped.db) | |||
| ret <- params_rse[,,drop=T] | |||
| if(use_percent) ret[params!=0]=ret[params!=0]*100 | |||
| if(use_percent) ret[params!=0]=round(ret[params!=0]*100) | |||
There was a problem hiding this comment.
I think that rounding results from this function can be dangerous. I would rather round results when printing. I'll make some changes here.
R/get_cv.R
Outdated
| if (i %in% c('bpop','d')) { | ||
| if (eval(parse(text=paste("dim(",i,")[2]>1")))) | ||
| (eval(parse(text=paste(i, "<-",i,"[,2]")))) | ||
| } |
There was a problem hiding this comment.
This doesn't do the right thing and should be removed. I will do this
|
Thanks Martin! I have removed the rounding for get_rse ... so if you want to have to output rounded when printing I suggest we add a method with print.rse |
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.
Hi Andy,
Some more refactoring done to clean up some more.
Should work without problems...
Cheers
Martin