search

dams-mcda / Dams-MCDA

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

New Data for Workshop #166

Closed elbfox closed 4 years ago

elbfox commented 4 years ago

Updates to MOGA-generated f_nrge/f_norm (NormalizedMatrix), www/maps, Decisions, and small ui.R server.R and WSM.R changes.

elbfox commented 4 years ago

Oh I just went through and resolved the conflicts. Looks like it didn't work!

This PR has updates to www/maps, f_nrge/f_norm (they're not working locally...I'm trying all different things to troubleshoot here but wanted you to have the updated versions @sythel ), DamsData_Workshop.csv and Decisions_workshop.csv

sythel commented 4 years ago

f_raw is sourced but missing from github

sythel commented 4 years ago

ready for review?

elbfox commented 4 years ago

Yes, I'm stuck where I tried to add f_raw but my branch is now behind because I resolved the conflicts here. I can addit with the next merge...f_raw was to help us check for errors in normalization and we actually don't need it in the script unless you call on it explicitly somewere that I haven't noticed

sythel commented 4 years ago

i will fix