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.

Sign up for GitHub

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

Jump to bottom

update NetOrigin 1008 #4

Merged

jmanitz merged 23 commits into jmanitz:master from junli14:master

Oct 31, 2020

Contributor

junli14 commented Oct 9, 2020

add 4 functions and 1 data set, update files


          update NetOrigin 1008

eda9a3d

Owner

jmanitz commented Oct 15, 2020 •

edited

Please see errors from CI:

checking package dependencies ... ERROR
Namespace dependency not required: 'corpcor'

jmanitz requested changes

View reviewed changes

Owner

jmanitz left a comment •

edited

Please rename SIB_model.R and initialize_SIB_model.R. Please edit functions accordingly.
historically, "SS" is an inappropriate choice

jmanitz requested changes

View reviewed changes

Owner

jmanitz left a comment

The other origin detection methods are wrapped within origin(). It would be good to align infer_source_bayesian() in that framework.

Examples dont require library(NetOrigin), training data should be added according to package structure

junli14 added 4 commits

October 18, 2020 17:24


          commit_10182020_v1

eac359a

Description
1. Revised sib model function and initialization functions names
2. Remove library(NetOrigin) in examples
3. Incorporate inference_bayesian in origin function

Not done
4. Conduct Continuous Integration by Appveyor - this commit is to check if it is fixed

Other potential revisions need to be added
5. Check if need to change origin_multiple function description, since bayesian method should not be used here


          revise example train.data load format

21e24f0


          update Rd example

05b833a


          update data description example

525ce33

Contributor Author

junli14 commented Oct 19, 2020

Update on Oct 18

junli14 and others added 9 commits

October 18, 2020 22:08


          delete plot(res, start=1) from performance function

8c36067


          delete all plot functions in examples

65a963f


          import mvtnorm in origin_methods


          delete analyze_net function in examples, cannot find

3cd77e8


          delete plot function in robustness r file

cee199d


          minor mistake in stochastic_sib_model

c0d97d8


          change sib model parameter to avoid negative prob

362a0ba


          fix percentage issue

2754db0


          Delete .Rhistory

ab35f54

jmanitz approved these changes

View reviewed changes

Owner

jmanitz left a comment

looks good as far i can tell

jmanitz approved these changes

View reviewed changes

jmanitz approved these changes

View reviewed changes

jmanitz approved these changes

View reviewed changes

jmanitz requested changes

View reviewed changes

Owner

jmanitz left a comment

please do not edit existing code

jmanitz requested changes

View reviewed changes

Owner

jmanitz left a comment

please do not edit existing code

jmanitz requested changes

View reviewed changes

Owner

jmanitz left a comment

please do not edit existing code

jmanitz approved these changes

View reviewed changes

jmanitz requested changes

View reviewed changes

Owner

jmanitz left a comment

please do not edit existing code


          Merge branch 'master' into master

1e08b96

jmanitz approved these changes

View reviewed changes

jmanitz requested changes

View reviewed changes

Owner

jmanitz left a comment

please do not edit existing code

jmanitz and others added 8 commits

October 21, 2020 22:57


          Update origin_helper.r

eb0491c


          Revert "delete plot(res, start=1) from performance function"

b256dac

This reverts commit 8c36067.


          Revert "delete all plot functions in examples"

ef9ba8d

This reverts commit 65a963f.


          Revert "delete analyze_net function in examples, cannot find"

d258d83

This reverts commit 3cd77e8.


          Revert "delete plot function in robustness r file"

25ee767

This reverts commit cee199d.


          debug package Oct25, 0 errors 2 warnings 1 note left, next document d…

63b4b6a

…ata, keep record here


          now only 1 note regarding data size >5M left, all others are ok now

eba24da


          Complete the fix of the package

a01ee7a

jmanitz approved these changes

View reviewed changes

jmanitz merged commit 048369b into jmanitz:master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment