Skip to content
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.

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

Add functions to spatially visualise individual and aggregate criteria for location selection #650

Open
wants to merge 39 commits into
base: main
Choose a base branch
from

Commits on Jan 24, 2024

  1. Configuration menu
    Copy the full SHA
    9a2aa9d View commit details
    Browse the repository at this point in the history
  2. Add connectivity data to ResultSet structure and constructor function

    Add docs for `store_conn` and add detail to docs for `store_env_summary`.
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a8f264b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4799214 View commit details
    Browse the repository at this point in the history
  4. Move priority predecessor criteria calculation and zones criteria cal…

    …culation into separate functions to avoid repetition
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3b8a703 View commit details
    Browse the repository at this point in the history
  5. Add function to plot specified criteria from a decision matrix as a g…

    …rid of spatial heatmaps
    
    Label dimensions with full site id to avoid errors with `viz.map`
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    89a3988 View commit details
    Browse the repository at this point in the history
  6. Add docs for viz.decision_matrices and option to plot without provi…

    …ded figure object
    
    Also fix how `axis_opts` is defined to avoid overwriting inputs
    
    Add documentation for `decision_matrices`
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e70e1d5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    96916ca View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0208208 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    deb0e61 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6918e3b View commit details
    Browse the repository at this point in the history
  11. Add plotting mcda aggregate score to decision matrix plots

    Change `decision.decision_matrices` to give both intervention matrices as output
    
    Add in plotting of scores in `viz.decision_matrices()` and change to square plotting grid
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    861f7ea View commit details
    Browse the repository at this point in the history
  12. Change grid size definition to be square

    Add title to aggregate score plot
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ba810a6 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    287489c View commit details
    Browse the repository at this point in the history
  14. Add "Vector{Any}" as possible type for priority_zones and `priority…

    …_sites` in criteria constuctors
    
    ( as these are their types in the result set)
    + formatting
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    5da0aa8 View commit details
    Browse the repository at this point in the history
  15. Add decison matrix creation from resultset to analysis

    Add decison matrix creation from resultset to analysis as new `decision.jl" file
    
    Remove `decision_matrices` from "location_selection.jl"
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6fac7ff View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    9c6de44 View commit details
    Browse the repository at this point in the history
  17. Remove area_to_seed as input in decision_matrices as no longer re…

    …quired
    
    Due to changes in how locations are deemed as having sufficient space
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    836687c View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    227808d View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    b2a2a26 View commit details
    Browse the repository at this point in the history
  20. Add separate parameters for in and out going connectivity weights for…

    … fogging
    
    This allows ease of extraction for decision matrix labelling
    Plus, update criteria weights docs
    
    Add use of separate ingoing and outgoing connectivity weights for fogging to mcda
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    bea727f View commit details
    Browse the repository at this point in the history
  21. Use criteria_params to extract weighting labels when creating decis…

    …ion matrices for plotting
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a0957a6 View commit details
    Browse the repository at this point in the history
  22. Add optional parameter filter_space when creating seed matrix so th…

    …at no filtering occurs when plotting seed decision matrix
    
    Update example and test scenarios with new parameters and parameter names
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ef1770e View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    d5b41d8 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    730f416 View commit details
    Browse the repository at this point in the history
  25. Add colorbar_limits as input to spatial to allow limits to be adj…

    …usted
    
    So all plots in `viz.decision_matrices` have the same colorbar range. This requires removing `color_range`which was an equivalent variable, previously set to `(0.0,maximum(data))`
    
    Add use of colorbar_limits ro `viz.decision_matrices`
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    f097986 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    562bbec View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    d251b41 View commit details
    Browse the repository at this point in the history
  28. Use _calc_gridsize to calculate n_rows and n_cols

    Remove `s_row_`s_col` statement as no longer necessary
    
    Remove unnecessary catch for the case when one figure is plotted (the least that can be plotted is 2)
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    9d10a4c View commit details
    Browse the repository at this point in the history
  29. Change criteria_weights to criteria_row for clarity

    + fix missing variables in doc string
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    78392d8 View commit details
    Browse the repository at this point in the history
  30. Remove unnecessary vec()

    Revert "Remove unnecessary `vec()`"
    
    This reverts commit 591daf3.
    
    Rename `TP_data` `conn_data` and remove unnecessary `vec()`
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    17b3649 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    3243908 View commit details
    Browse the repository at this point in the history
  32. Revert "Update Union{Float64,Float32} type to :>Real`"

    This reverts commit 8ecbbcd.
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    738380e View commit details
    Browse the repository at this point in the history
  33. Add env_aggregation as optional input for environmental summary fun…

    …ction and `mcda_func` for scores calculation
    
    Change output to Dict of decision matrices and scores for each intervention
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a194638 View commit details
    Browse the repository at this point in the history
  34. Remove ADRIA.decision from matrix creation and criteria definition …

    …functions as no longer needed inside decision module
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3b80d4b View commit details
    Browse the repository at this point in the history
  35. Add CriteriaWeights to imports and format

    Move `decision_matrices` to `decision` module
    
    Move `decision_matrices` into decision module
    
    Move around file compilation order to allow this in `ADRIA.jl`
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    8e18159 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    e3c624b View commit details
    Browse the repository at this point in the history
  37. Fix how scores are plotted (should be inside loop), add use of human …

    …readable criteria names for labels
    
    Plus add criteria names as optional inputs so less than total set of criteria can be plotted
    Rosejoycrocker committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    9207094 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    1af510d View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    353032c View commit details
    Browse the repository at this point in the history