conflicts are resolved in ash.R and truncnorm.R

[MuzheZeng]

BTW, one of the comments posted in this issue gives roughly the steps we took to merge the two master branches:

[stephens999]

the travis build says two tests fail:

1. Error: comp_postmean for missing data is 0 (@test_flashdata.R#16)
2. Error: comp_postprob for missing data is fitted pi (@test_flashdata.R#21)

have you replicated this test failure, or do the tests pass for you?

[MuzheZeng]

        Oh I discovered that too. I'll look into that. Peter and I were dealing with github issue yesterday. The coding part was my problem--------------------

Muzhe Zeng University of Chicago, Master of Statistics Peking University in School of Mathematics(Bachelor) Double major in Economics, CCER Club(Bachelor) 在2016年12月01日 10:48，stephens999 写道:the travis build says two tests fail:

Error: comp_postmean for missing data is 0 (@test_flashdata.R#16) Error: comp_postprob for missing data is fitted pi (@test_flashdata.R#21)

have you replicated this test failure, or do the tests pass for you?

—You are receiving this because you authored the thread.Reply to this email directly, view it on GitHub, or mute the thread.

{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/stephens999/ashr","title":"stephens999/ashr","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/stephens999/ashr"}},"updates":{"snippets":[{"icon":"PERSON","message":"@stephens999 in #47: the travis build says two tests fail:\r\n 1. Error: comp_postmean for missing data is 0 (@test_flashdata.R#16) \r\n 2. Error: comp_postprob for missing data is fitted pi (@test_flashdata.R#21) \r\n\r\nhave you replicated this test failure, or do the tests pass for you?"}],"action":{"name":"View Pull Request","url":"https://github.com/stephens999/ashr/pull/47#issuecomment-264226354"}}}

[coveralls]

Coverage increased (+1.3%) to 69.44% when pulling b092794ebe6f29abdfffc130e7dbdd94dddbfb66 on MuzheZeng:master into f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

[pcarbo]

would it work to just add 1e-100 to every entry of matrix_lik?

Or add .Machine$double.eps?

> .Machine$double.eps
2.22e-16

[MuzheZeng]

Dear Prof. Matthew:

I added some comment in the truncnorm.R and pull request again. I'm not sure what you mean by update the version number in DESCRIPTION? Can you instruct more on that?

---

Muzhe Zeng University of Chicago, Master of Statistics University of Chicago Booth School of Business, Research Assistant Peking University, School of Mathematics Science(Bachelor) Double major in Economics of CCER (Bachelor)

---

发件人: stephens999 [notifications@github.com] 发送时间: 2016年12月7日 13:19 收件人: stephens999/ashr 抄送: Mazon Zeng; Author 主题: Re: [stephens999/ashr] conflicts are resolved in ash.R and truncnorm.R (#47)

@stephens999 commented on this pull request.

once you've dealt with these can you also update the version number in DESCRIPTION? Then i think it is done!

---

In R/truncnorm.Rhttps://github.com/stephens999/ashr/pull/47#pullrequestreview-11875283:

• tmp
• NAentry = is.na(tmp)
• if(sum(NAentry)>0 | sum(sd==0)>0) {

can you put some comments into the code to explain what is going on here?

― You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://github.com/stephens999/ashr/pull/47#pullrequestreview-11875283, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AOPWwi6srCapGnlkX5qw4dhi27gKw5r0ks5rFwbagaJpZM4LAvk9.

[coveralls]

Coverage increased (+1.3%) to 69.44% when pulling 76d6da5f2920a1af1072903763ec348d84321c71 on MuzheZeng:master into f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

[coveralls]

Coverage increased (+1.3%) to 69.44% when pulling 76d6da5f2920a1af1072903763ec348d84321c71 on MuzheZeng:master into f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

[stephens999]

Muzhe, the DESCRIPTION file is here: https://github.com/stephens999/ashr/blob/master/DESCRIPTION

so you would change 2.0.4 to 2.0.5

Matthew

On Wed, Dec 7, 2016 at 3:22 PM, Coveralls notifications@github.com wrote:

[image: Coverage Status] https://coveralls.io/builds/9176674

Coverage increased (+1.3%) to 69.44% when pulling 76d6da5 https://github.com/stephens999/ashr/commit/76d6da5f2920a1af1072903763ec348d84321c71 on MuzheZeng:master into f769c07 https://github.com/stephens999/ashr/commit/f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/stephens999/ashr/pull/47#issuecomment-265577187, or mute the thread https://github.com/notifications/unsubscribe-auth/ABt4xedKdRXg_WiQlei8K0x4Elrp0g8Iks5rFyOLgaJpZM4LAvk9 .

[stephens999]

also, did you see my comment on the gradient function? I wondered if you could simplify that code? Matthew

On Fri, Dec 9, 2016 at 2:19 PM, Matthew Stephens stephens999@gmail.com wrote:

Muzhe, the DESCRIPTION file is here: https://github.com/stephens999/ashr/blob/master/DESCRIPTION

so you would change 2.0.4 to 2.0.5

Matthew

On Wed, Dec 7, 2016 at 3:22 PM, Coveralls notifications@github.com wrote:

[image: Coverage Status] https://coveralls.io/builds/9176674

Coverage increased (+1.3%) to 69.44% when pulling 76d6da5 https://github.com/stephens999/ashr/commit/76d6da5f2920a1af1072903763ec348d84321c71 on MuzheZeng:master into f769c07 https://github.com/stephens999/ashr/commit/f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/stephens999/ashr/pull/47#issuecomment-265577187, or mute the thread https://github.com/notifications/unsubscribe-auth/ABt4xedKdRXg_WiQlei8K0x4Elrp0g8Iks5rFyOLgaJpZM4LAvk9 .

[MuzheZeng]

        I'll handle that later. I was in the middle of my fly back home. Sorry for the delay professor--------------------

Muzhe Zeng University of Chicago, Master of Statistics Peking University in School of Mathematics(Bachelor) Double major in Economics, CCER Club(Bachelor) 在2016年12月09日 12:19，stephens999 写道:also, did you see my comment on the gradient function? I wondered if you could simplify that code? Matthew

On Fri, Dec 9, 2016 at 2:19 PM, Matthew Stephens stephens999@gmail.com wrote:

Muzhe, the DESCRIPTION file is here: https://github.com/stephens999/ashr/blob/master/DESCRIPTION

so you would change 2.0.4 to 2.0.5

Matthew

On Wed, Dec 7, 2016 at 3:22 PM, Coveralls notifications@github.com wrote:

[image: Coverage Status] https://coveralls.io/builds/9176674

Coverage increased (+1.3%) to 69.44% when pulling 76d6da5 https://github.com/stephens999/ashr/commit/76d6da5f2920a1af1072903763ec348d84321c71 on MuzheZeng:master into f769c07 https://github.com/stephens999/ashr/commit/f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/stephens999/ashr/pull/47#issuecomment-265577187, or mute the thread https://github.com/notifications/unsubscribe-auth/ABt4xedKdRXg_WiQlei8K0x4Elrp0g8Iks5rFyOLgaJpZM4LAvk9 .

—You are receiving this because you were mentioned.Reply to this email directly, view it on GitHub, or mute the thread.

{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/stephens999/ashr","title":"stephens999/ashr","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/stephens999/ashr"}},"updates":{"snippets":[{"icon":"PERSON","message":"@stephens999 in #47: also, did you see my comment on the gradient function?\nI wondered if you could simplify that code?\nMatthew\n\nOn Fri, Dec 9, 2016 at 2:19 PM, Matthew Stephens \u003cstephens999@gmail.com\u003e\nwrote:\n\n\u003e Muzhe, the DESCRIPTION file is here:\n\u003e https://github.com/stephens999/ashr/blob/master/DESCRIPTION\n\u003e\n\u003e so you would change 2.0.4 to 2.0.5\n\u003e\n\u003e Matthew\n\u003e\n\u003e On Wed, Dec 7, 2016 at 3:22 PM, Coveralls \u003cnotifications@github.com\u003e\n\u003e wrote:\n\u003e\n\u003e\u003e [image: Coverage Status] \u003chttps://coveralls.io/builds/9176674\u003e\n\u003e\u003e\n\u003e\u003e Coverage increased (+1.3%) to 69.44% when pulling 76d6da5\n\u003e\u003e \u003chttps://github.com/stephens999/ashr/commit/76d6da5f2920a1af1072903763ec348d84321c71\u003e\n\u003e\u003e on MuzheZeng:master into f769c07\n\u003e\u003e \u003chttps://github.com/stephens999/ashr/commit/f769c074daff836fbc239276cedc57b2bf0e330e\u003e\n\u003e\u003e on stephens999:master.\n\u003e\u003e\n\u003e\u003e —\n\u003e\u003e You are receiving this because you were mentioned.\n\u003e\u003e Reply to this email directly, view it on GitHub\n\u003e\u003e \u003chttps://github.com/stephens999/ashr/pull/47#issuecomment-265577187\u003e, or mute\n\u003e\u003e the thread\n\u003e\u003e \u003chttps://github.com/notifications/unsubscribe-auth/ABt4xedKdRXg_WiQlei8K0x4Elrp0g8Iks5rFyOLgaJpZM4LAvk9\u003e\n\u003e\u003e .\n\u003e\u003e\n\u003e\n\u003e\n"}],"action":{"name":"View Pull Request","url":"https://github.com/stephens999/ashr/pull/47#issuecomment-266113041"}}}

[coveralls]

Coverage increased (+1.3%) to 69.44% when pulling ac74e265585626521215bbca7d36c142838d495d on MuzheZeng:master into f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

[coveralls]

Coverage increased (+1.3%) to 69.44% when pulling ac74e265585626521215bbca7d36c142838d495d on MuzheZeng:master into f769c074daff836fbc239276cedc57b2bf0e330e on stephens999:master.

[stephens999]

merged!