search

dams-mcda / Dams-MCDA

Emma Fox R/Shiny Project with a docker server configuration
1 stars 0 forks source link

Combining Changes #121

Closed sythel closed 5 years ago

sythel commented 5 years ago

PR looks good to me; however it's missing f_nrge2.RData

edit: nevermind it changes it to f_nrge.RData

sythel commented 5 years ago

change that was requested was made

elbfox commented 5 years ago

Thank you! I'm now viewing CombinedPreferenceOutput to check on the 100% thing

elbfox commented 5 years ago

Oops...looks like the whole block of individual dam tables for the results tabs got deleted from WSM_graphs_test.R in the merge. It was the second large block of code. Need that for generating decision matrix outputs (I haven't added this as an issue yet...I'm super behind on this)

EDIT: tables described here

sythel commented 5 years ago

@elbfox line 403 -> 514?

elbfox commented 5 years ago

Yes. I tried to add it back in just now and I've really confused my index state, so if it's easy for you to add it back in, please do.

sythel commented 5 years ago

its there for me; might have to fetch and pull the branch again