search

FluSightNetwork / cdc-flusight-ensemble

Guidelines and forecasts for a collaborative U.S. influenza forecasting project.
http://flusightnetwork.io/
37 stars 22 forks source link

CUBMA update #206

Closed tkcy closed 4 years ago

tkcy commented 4 years ago

Replaced CUBMA files with raw model files without the post-processing that was applied to previously submitted CUBMA files.

nickreich commented 4 years ago

Teresa- There are some "conflicts" with this PR and the master branch. I will try to take a look at it later, but if you have the chance to maybe make sure that you have updated your repository to the most recent version of all files before adding your new files there is a chance that would resolve this as well...

tkcy commented 4 years ago

Hi Nick,

From what I can figure out, it doesn’t like that I removed the 2018-19 real time forecasts. I had deleted them, then copied the new 2018-19 files into the training folder. So the file names moved from realtime to training folder, and the contents of the files were changed as well.

I could put the original 18-19 files back into the folder and try again if that’s the best way to resolve?

I tried to sync from the master branch just now but that is also giving me the same error messages since my folder now has my new files. Now I know to sync before pull request in the future.

Teresa

On Oct 15, 2019, at 1:58 PM, Nicholas G Reich notifications@github.com<mailto:notifications@github.com> wrote:

Teresa- There are some "conflicts" with this PR and the master branch. I will try to take a look at it later, but if you have the chance to maybe make sure that you have updated your repository to the most recent version of all files before adding your new files there is a chance that would resolve this as well...

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_FluSightNetwork_cdc-2Dflusight-2Densemble_pull_206-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DABSAKVPIC4RQTUWYR6MOBRLQOYADXA5CNFSM4JA656HKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBJVPGI-23issuecomment-2D542332825&d=DwMCaQ&c=G2MiLlal7SXE3PeSnG8W6_JBU6FcdVjSsBSbw6gcR0U&r=laz-qrRhDunc-NsMF8Ul08nHvPVHcFoyEpYiL7fejU0&m=scnWjoMNBwer-1HtocQ7XsMenggpETNnlcvoLATTN28&s=7pKiD36v1Drsvj4t4db5ToQL-DNadztYFF-4B_Ed4O8&e=, or unsubscribehttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_ABSAKVKALWQNVDHSCKA66HLQOYADXANCNFSM4JA656HA&d=DwMCaQ&c=G2MiLlal7SXE3PeSnG8W6_JBU6FcdVjSsBSbw6gcR0U&r=laz-qrRhDunc-NsMF8Ul08nHvPVHcFoyEpYiL7fejU0&m=scnWjoMNBwer-1HtocQ7XsMenggpETNnlcvoLATTN28&s=dZFA7mvkpzN06cU1D-AIV0yHe7c67yIDOeLzmhOP1-4&e=.

tkcy commented 4 years ago

More specifically, it looks like the problem is that since my last sync with the master directory, someone on your end moved the CUBMA 2018-19 files to the training folder while I also put different files for CUBMA 2018-19 into the same folder. These 29 files are the source of the conflict, and my version should be used.

Thanks! Sorry I don’t know how to fix this myself.

On Oct 15, 2019, at 3:11 PM, Yamana, Teresa K. tky2104@cumc.columbia.edu<mailto:tky2104@cumc.columbia.edu> wrote:

Hi Nick,

From what I can figure out, it doesn’t like that I removed the 2018-19 real time forecasts. I had deleted them, then copied the new 2018-19 files into the training folder. So the file names moved from realtime to training folder, and the contents of the files were changed as well.

I could put the original 18-19 files back into the folder and try again if that’s the best way to resolve?

I tried to sync from the master branch just now but that is also giving me the same error messages since my folder now has my new files. Now I know to sync before pull request in the future.

Teresa

On Oct 15, 2019, at 1:58 PM, Nicholas G Reich notifications@github.com<mailto:notifications@github.com> wrote:

Teresa- There are some "conflicts" with this PR and the master branch. I will try to take a look at it later, but if you have the chance to maybe make sure that you have updated your repository to the most recent version of all files before adding your new files there is a chance that would resolve this as well...

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_FluSightNetwork_cdc-2Dflusight-2Densemble_pull_206-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DABSAKVPIC4RQTUWYR6MOBRLQOYADXA5CNFSM4JA656HKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBJVPGI-23issuecomment-2D542332825&d=DwMCaQ&c=G2MiLlal7SXE3PeSnG8W6_JBU6FcdVjSsBSbw6gcR0U&r=laz-qrRhDunc-NsMF8Ul08nHvPVHcFoyEpYiL7fejU0&m=scnWjoMNBwer-1HtocQ7XsMenggpETNnlcvoLATTN28&s=7pKiD36v1Drsvj4t4db5ToQL-DNadztYFF-4B_Ed4O8&e=, or unsubscribehttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_ABSAKVKALWQNVDHSCKA66HLQOYADXANCNFSM4JA656HA&d=DwMCaQ&c=G2MiLlal7SXE3PeSnG8W6_JBU6FcdVjSsBSbw6gcR0U&r=laz-qrRhDunc-NsMF8Ul08nHvPVHcFoyEpYiL7fejU0&m=scnWjoMNBwer-1HtocQ7XsMenggpETNnlcvoLATTN28&s=dZFA7mvkpzN06cU1D-AIV0yHe7c67yIDOeLzmhOP1-4&e=.

nickreich commented 4 years ago

I think I added the updated CU BMA files manually by downloading the files from your forked repo separately and then adding them manually. Can you double-check that I've corrected the right files in the right way?

nickreich commented 4 years ago

I think this is closed by earlier commit. Am closing this now, but am hoping that @tkcy will confirm at some point that the files look right...

tkcy commented 4 years ago

FIles look good. thank you!

On Oct 16, 2019, at 9:03 PM, Nicholas G Reich notifications@github.com<mailto:notifications@github.com> wrote:

I think this is closed by earlier commit. Am closing this now, but am hoping that @tkcyhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_tkcy&d=DwMCaQ&c=G2MiLlal7SXE3PeSnG8W6_JBU6FcdVjSsBSbw6gcR0U&r=laz-qrRhDunc-NsMF8Ul08nHvPVHcFoyEpYiL7fejU0&m=mbfs2ouDc125WtWr41Bzt7WYA-kfjeKvndGTndeebnU&s=9gHNSl44LwOTrZ1_TjfloI1NCQyZMeovCRnI1KfBBVM&e= will confirm at some point that the files look right...

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_FluSightNetwork_cdc-2Dflusight-2Densemble_pull_206-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DABSAKVIHO3CQMO4L6GCDI5LQO62WPA5CNFSM4JA656HKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBOMUKA-23issuecomment-2D542951976&d=DwMCaQ&c=G2MiLlal7SXE3PeSnG8W6_JBU6FcdVjSsBSbw6gcR0U&r=laz-qrRhDunc-NsMF8Ul08nHvPVHcFoyEpYiL7fejU0&m=mbfs2ouDc125WtWr41Bzt7WYA-kfjeKvndGTndeebnU&s=jQRXKjRxnC6CwYZDQHIjY4IcwxT1dTvQMEZTABcidGM&e=, or unsubscribehttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_ABSAKVMNNANKHI45U5Q6AWDQO62WPANCNFSM4JA656HA&d=DwMCaQ&c=G2MiLlal7SXE3PeSnG8W6_JBU6FcdVjSsBSbw6gcR0U&r=laz-qrRhDunc-NsMF8Ul08nHvPVHcFoyEpYiL7fejU0&m=mbfs2ouDc125WtWr41Bzt7WYA-kfjeKvndGTndeebnU&s=3LdMujte_vl3IkfHpfkp7krFsgC8BS7WieR1fMoCKbQ&e=.