From 30cf3920a9648546dd7c127c3ff7f244b2253194 Mon Sep 17 00:00:00 2001 From: evanwilliams Date: Thu, 11 Mar 2021 16:29:59 -0500 Subject: [PATCH] SWU: HEI, not WQI --- .../{WQI.java => HEI.java} | 82 +++++++------------ 1 file changed, 28 insertions(+), 54 deletions(-) rename app/src/main/java/com/sf/stormwaterutilityandroid/{WQI.java => HEI.java} (67%) diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WQI.java b/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java similarity index 67% rename from app/src/main/java/com/sf/stormwaterutilityandroid/WQI.java rename to app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java index 813c0dd..1051afa 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WQI.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java @@ -1,32 +1,33 @@ package com.sf.stormwaterutilityandroid; -public class WQI { - private double QHEI_substrate_size; - private double QHEI_smothering; - private double QHEI_silting; - private double QHEI_rootwads; - private double QHEI_overhanging_veg; - private double QHEI_oxbowsblack_waters; - private double QHEI_downed_treeslogs; - private double QHEI_shallows; - private double QHEI_water_plants; - private double QHEI_deep_pools; - private double QHEI_logswoody_debris; - private double QHEI_boulders; - private double QHEI_undercut_banks; - private double QHEI_sinuosity; - private double QHEI_natural; - private double QHEI_riparian_width; - private double QHEI_land_use; - private double QHEI_bank_erosion; - private double QHEI_stream_shading; - private double QHEI_deepest_pool; - private double QHEI_velocity; - private double QHEI_rifflerun_depth; - private double QHEI_rifflerun_substrate; +public class HEI { + //by default, all values are set to be 0 + private double QHEI_substrate_size = 0; + private double QHEI_smothering = 0; + private double QHEI_silting = 0; + private double QHEI_rootwads = 0; + private double QHEI_overhanging_veg = 0; + private double QHEI_oxbowsblack_waters = 0; + private double QHEI_downed_treeslogs = 0; + private double QHEI_shallows = 0; + private double QHEI_water_plants = 0; + private double QHEI_deep_pools = 0; + private double QHEI_logswoody_debris = 0; + private double QHEI_boulders = 0; + private double QHEI_undercut_banks = 0; + private double QHEI_sinuosity = 0; + private double QHEI_natural = 0; + private double QHEI_riparian_width = 0; + private double QHEI_land_use = 0; + private double QHEI_bank_erosion = 0; + private double QHEI_stream_shading = 0; + private double QHEI_deepest_pool = 0; + private double QHEI_velocity = 0; + private double QHEI_rifflerun_depth = 0; + private double QHEI_rifflerun_substrate = 0; //constructor - WQI(double QHEI_substrate_size, double QHEI_smothering, double QHEI_silting, double QHEI_rootwads, double QHEI_overhanging_veg, + HEI(double QHEI_substrate_size, double QHEI_smothering, double QHEI_silting, double QHEI_rootwads, double QHEI_overhanging_veg, double QHEI_oxbowsblack_waters, double QHEI_downed_treeslogs, double QHEI_shallows, double QHEI_water_plants, double QHEI_logswoody_debris, double QHEI_boulders, double QHEI_undercut_banks, double QHEI_sinuosity, double QHEI_natural, double QHEI_riparian_width, double QHEI_land_use, double QHEI_bank_erosion, double QHEI_stream_shading, double QHEI_deepest_pool, double QHEI_velocity, @@ -57,34 +58,7 @@ public class WQI { this.QHEI_deep_pools = QHEI_deep_pools; } - WQI() - { - QHEI_substrate_size = 0; - QHEI_smothering = 0; - QHEI_silting = 0; - QHEI_rootwads = 0; - QHEI_overhanging_veg = 0; - QHEI_oxbowsblack_waters = 0; - QHEI_downed_treeslogs = 0; - QHEI_shallows = 0; - QHEI_water_plants = 0; - QHEI_deep_pools = 0; - QHEI_logswoody_debris = 0; - QHEI_boulders = 0; - QHEI_undercut_banks = 0; - QHEI_sinuosity = 0; - QHEI_natural = 0; - QHEI_riparian_width = 0; - QHEI_land_use = 0; - QHEI_bank_erosion = 0; - QHEI_stream_shading = 0; - QHEI_deepest_pool = 0; - QHEI_velocity = 0; - QHEI_rifflerun_depth = 0; - QHEI_rifflerun_substrate = 0; - } - - public double calculate_WQI() { + public double calculate_HEI() { return QHEI_substrate_size + QHEI_smothering + QHEI_silting + QHEI_rootwads + QHEI_overhanging_veg + QHEI_oxbowsblack_waters + QHEI_downed_treeslogs + QHEI_shallows + QHEI_water_plants + QHEI_deep_pools + QHEI_logswoody_debris + QHEI_boulders + QHEI_undercut_banks + 2 * (QHEI_sinuosity + QHEI_natural) + @@ -92,7 +66,7 @@ public double calculate_WQI() { QHEI_velocity + QHEI_rifflerun_depth + QHEI_rifflerun_substrate; } - public static double get_WQI(double QHEI_substrate_size, double QHEI_smothering, double QHEI_silting, double QHEI_rootwads, double QHEI_overhanging_veg, + public static double get_HEI(double QHEI_substrate_size, double QHEI_smothering, double QHEI_silting, double QHEI_rootwads, double QHEI_overhanging_veg, double QHEI_oxbowsblack_waters, double QHEI_downed_treeslogs, double QHEI_shallows, double QHEI_water_plants, double QHEI_logswoody_debris, double QHEI_boulders, double QHEI_undercut_banks, double QHEI_sinuosity, double QHEI_natural, double QHEI_riparian_width, double QHEI_land_use, double QHEI_bank_erosion, double QHEI_stream_shading, double QHEI_deepest_pool, double QHEI_velocity,