Skip to content

Commit

Permalink
Fix criteria names and order while incorporating rebase changes
Browse files Browse the repository at this point in the history 
Revert changes introduced in rebase - String input needed to allow ResultSet parameters to be used
  • Loading branch information
@Rosejoycrocker
Rosejoycrocker committed Jan 23, 2024
1 parent 06927d6 commit 05f92ea
Showing 1 changed file with 131 additions and 122 deletions.
253 changes: 131 additions & 122 deletions src/decision/CriteriaWeights.jl
View file
Original file line number Diff line number Diff line change
@@ -1,156 +1,165 @@
Base.@kwdef struct CriteriaWeights{U2,U3,DO} <: EcoModel
seed_wave_stress::U2 = Factor(
Base.@kwdef struct CriteriaWeights{U2, U3, DO} <: EcoModel
seed_in_connectivity::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Seed Wave Stress",
description="Importance of avoiding wave stress when seeding. Higher values places more weight on areas with low wave stress.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Incoming Connectivity (Seed)",
description = "Higher values give preference to locations with high incoming connectivity (i.e., receives larvae from other sites) for enhanced coral deployments.",
)
seed_heat_stress::U2 = Factor(
seed_out_connectivity::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Seed Heat Stress",
description="Importance of avoiding heat stress when seeding. Higher values places more weight on areas with low heat stress.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Outgoing Connectivity (Seed)",
description = "Higher values give preference to locations with high outgoing connectivity (i.e., provides larvae to other sites) for enhanced coral deployments.",
)
fog_wave_stress::U2 = Factor(
seed_wave_stress::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:fog, :weight),
name="Shade Wave Stress",
description="Importance of avoiding wave stress when fogging. Higher values places more weight on areas with low wave stress.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Seed Wave Stress",
description = "Importance of avoiding wave stress when seeding. Higher values places more weight on areas with low wave stress.",
)
fog_heat_stress::U2 = Factor(
seed_heat_stress::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:fog, :weight),
name="Shade Heat Stress",
description="Importance of avoiding heat stress when fogging. Higher values places more weight on areas with low heat stress.",
)
fog_connectivity::U2 = Factor(
0.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:fog, :weight),
name="Shade Connectivity",
description="Higher values give preference to locations with high connectivity for shading deployments.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Seed Heat Stress",
description = "Importance of avoiding heat stress when seeding. Higher values places more weight on areas with low heat stress.",
)
seed_in_connectivity::U2 = Factor(
seed_priority::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Incoming Connectivity (Seed)",
description="Higher values give preference to locations with high incoming connectivity (i.e., receives larvae from other sites) for enhanced coral deployments.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Predecessor Priority (Seed)",
description = "Importance of seeding sites that provide larvae to priority reefs.",
)
seed_out_connectivity::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Outgoing Connectivity (Seed)",
description="Higher values give preference to locations with high outgoing connectivity (i.e., provides larvae to other sites) for enhanced coral deployments.",
seed_zone::U2 = Factor(
0.0;
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Zone Predecessor (Seed)",
description = "Importance of seeding sites that provide larvae to priority (target) zones.",
)
seed_coral_cover_low::U2 = Factor(
0.0;
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Low Coral Cover",
description = "Higher values give greater preference to sites with low coral cover for seeding deployments.",
)
seed_depth::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Depth (Seed)",
description="Higher values give preference to deeper locations for enhanced coral deployments.",
)
coral_cover_low::U2 = Factor(
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:seed, :weight),
name = "Depth (Seed)",
description = "Higher values give preference to deeper locations for enhanced coral deployments.",
)
fog_in_connectivity::U2 = Factor(
0.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Low Coral Cover",
description="Higher values give greater preference to sites with low coral cover for seeding deployments.",
)
coral_cover_high::U2 = Factor(
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:fog, :weight),
name = "Outgoing Connectivity (Fog)",
description = "Higher values give preference to locations with high incoming connectivity for foggining deployments.",
)
fog_out_connectivity::U2 = Factor(
0.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:fog, :weight),
name="High Coral Cover",
description="Higher values give preference to sites with high coral cover for shading deployments.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:fog, :weight),
name = "Incoming Connectivity (Fog)",
description = "Higher values give preference to locations with high outgoing connectivity for fogging deployments.",
)
seed_priority::U2 = Factor(
fog_wave_stress::U2 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Predecessor Priority (Seed)",
description="Importance of seeding sites that provide larvae to priority reefs.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:fog, :weight),
name = "Shade Wave Stress",
description = "Importance of avoiding wave stress when fogging. Higher values places more weight on areas with low wave stress.",
)
fog_priority::U2 = Factor(
0.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:fog, :weight),
name="Predecessor Priority (Shade)",
description="Importance of shading sites that provide larvae to priority reefs.",
fog_heat_stress::U2 = Factor(
1.0;
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:fog, :weight),
name = "Shade Heat Stress",
description = "Importance of avoiding heat stress when fogging. Higher values places more weight on areas with low heat stress.",
)
seed_zone::U2 = Factor(
fog_priority::U2 = Factor(
0.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:seed, :weight),
name="Zone Predecessor (Seed)",
description="Importance of seeding sites that provide larvae to priority (target) zones.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:fog, :weight),
name = "Predecessor Priority (Shade)",
description = "Importance of shading sites that provide larvae to priority reefs.",
)
fog_zone::U2 = Factor(
0.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:fog, :weight),
name="Zone Predecessor (Shade)",
description="Importance of shading sites that provide larvae to priority (target) zones.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:fog, :weight),
name = "Zone Predecessor (Shade)",
description = "Importance of shading sites that provide larvae to priority (target) zones.",
)
fog_coral_cover_high::U2 = Factor(
0.0;
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:fog, :weight),
name = "High Coral Cover",
description = "Higher values give preference to sites with high coral cover for shading deployments.",
)
deployed_coral_risk_tol::U3 = Factor(
1.0;
ptype="continuous",
dist=Uniform,
dist_params=(0.0, 1.0),
criteria_keywords=(:threshold, :seed, :fog),
name="Risk Tolerance",
description="Filters out sites with heat/wave stress above threshold.",
ptype = "continuous",
dist = Uniform,
dist_params = (0.0, 1.0),
criteria_keywords = (:threshold, :seed, :fog),
name = "Risk Tolerance",
description = "Filters out sites with heat/wave stress above threshold.",
)
depth_min::DO = Factor(
5.0;
ptype="ordered categorical",
dist=DiscreteOrderedUniformDist,
dist_params=(3.0, 5.0, 0.5), # Half metre intervals
criteria_keywords=(:threshold,),
name="Minimum Depth",
description="Minimum depth for a site to be included for consideration.\nNote: This value will be replaced with the shallowest depth value found if all sites are found to be deeper than `depth_min + depth_offset`.",
ptype = "ordered categorical",
dist = DiscreteOrderedUniformDist,
dist_params = (3.0, 5.0, 0.5), # Half metre intervals
criteria_keywords = (:threshold,),
name = "Minimum Depth",
description = "Minimum depth for a site to be included for consideration.\nNote: This value will be replaced with the shallowest depth value found if all sites are found to be deeper than `depth_min + depth_offset`.",
)
depth_offset::DO = Factor(
10.0;
ptype="ordered categorical",
dist=DiscreteOrderedUniformDist,
dist_params=(10.0, 25.0, 0.5), # Half metre intervals
criteria_keywords=(:threshold,),
name="Depth Offset",
description="Offset from minimum depth, used to indicate maximum depth.",
ptype = "ordered categorical",
dist = DiscreteOrderedUniformDist,
dist_params = (10.0, 25.0, 0.5), # Half metre intervals
criteria_keywords = (:threshold,),
name = "Depth Offset",
description = "Offset from minimum depth, used to indicate maximum depth.",
)
end

Expand All @@ -165,7 +174,7 @@ Retrieve relevant criteria by associated keywords.
"""
function criteria_params(
crit::DataFrame,
criteria_keywords::Union{Tuple{Symbol,Symbol},Tuple{Symbol,Symbol,Symbol}},
criteria_keywords::Union{Tuple{Symbol, Symbol}, Tuple{Symbol, Symbol, Symbol}, String},
)::DataFrame
sel_crit = vec(
all(
Expand Down

0 comments on commit 05f92ea

Please sign in to comment.