Output table updates (#1173)

Co-authored-by: Richard Nugent III <richard.nugent.3@gmail.com>
HydrologicEngineeringCenter · Nov 26, 2024 · 0a64557 · 0a64557
1 parent 495dd90
commit 0a64557
Show file tree

Hide file tree

Showing 29 changed files with 1,183 additions and 843 deletions.
diff --git a/HEC.FDA.Model/alternatives/Alternative.cs b/HEC.FDA.Model/alternatives/Alternative.cs
@@ -84,7 +84,7 @@ private AlternativeResults RunAnnualizationCompute(List<int> analysisYears, doub
             {
                 //To keep track of which results have yet to be processed
                 //I think this allows us to handle situations where we have uneven numbers of results 
-                List<IContainImpactAreaScenarioResults> futureYearResultsList = new();
+                List<ImpactAreaScenarioResults> futureYearResultsList = new();
                 foreach (ImpactAreaScenarioResults futureYearImpactAreaScenarioResults in computedResultsFutureYear.ResultsList.Cast<ImpactAreaScenarioResults>())
                 {
                     futureYearResultsList.Add(futureYearImpactAreaScenarioResults);
@@ -114,7 +114,7 @@ private AlternativeResults RunAnnualizationCompute(List<int> analysisYears, doub
             return alternativeResults;
         }
 
-        private double ProcessBaseAndFutureYearScenarioResults(List<int> analysisYears, double discountRate, int periodOfAnalysis, ScenarioResults computedResultsBaseYear, ScenarioResults computedResultsFutureYear, AlternativeResults alternativeResults, List<IContainImpactAreaScenarioResults> futureYearResultsList, double quantityOFDamCatAssetCatImpactAreaCombos)
+        private double ProcessBaseAndFutureYearScenarioResults(List<int> analysisYears, double discountRate, int periodOfAnalysis, ScenarioResults computedResultsBaseYear, ScenarioResults computedResultsFutureYear, AlternativeResults alternativeResults, List<ImpactAreaScenarioResults> futureYearResultsList, double quantityOFDamCatAssetCatImpactAreaCombos)
         {
             double progressTicker = 0;
             foreach (ImpactAreaScenarioResults baseYearResults in computedResultsBaseYear.ResultsList.Cast<ImpactAreaScenarioResults>())
@@ -190,7 +190,7 @@ private double ProcessBaseAndFutureYearScenarioResults(List<int> analysisYears,
 
 
         private void ProcessUnmatchedFutureResults(List<int> analysisYears, double discountRate, int periodOfAnalysis, ScenarioResults computedResultsBaseYear, AlternativeResults alternativeResults,
-            List<IContainImpactAreaScenarioResults> futureYearResultsList, CancellationToken cancellationToken)
+            List<ImpactAreaScenarioResults> futureYearResultsList, CancellationToken cancellationToken)
         {
             foreach (ImpactAreaScenarioResults futureYearResults in futureYearResultsList.Cast<ImpactAreaScenarioResults>())
             {

diff --git a/HEC.FDA.Model/compute/ImpactAreaScenarioSimulation.cs b/HEC.FDA.Model/compute/ImpactAreaScenarioSimulation.cs
@@ -981,7 +981,7 @@ public static ImpactAreaScenarioSimulation ReadFromXML(XElement xElement)
             GraphicalUncertainPairedData frequencyStage = GraphicalUncertainPairedData.ReadFromXML(xElement.Element(FREQUENCY_STAGE_ELEMENT_NAME));
             UncertainPairedData interiorExterior = UncertainPairedData.ReadFromXML(xElement.Element(INTERIOR_EXTERIOR_ELEMENT_NAME));
             UncertainPairedData systemResponse = UncertainPairedData.ReadFromXML(xElement.Element(SYSTEM_RESPONSE_ELEMENT_NAME));
-            IContainImpactAreaScenarioResults impactAreaScenarioResults = ImpactAreaScenarioResults.ReadFromXML(xElement.Element(IMPACT_AREA_SCENARIO_RESULTS_ELEMENT_NAME));
+            ImpactAreaScenarioResults impactAreaScenarioResults = ImpactAreaScenarioResults.ReadFromXML(xElement.Element(IMPACT_AREA_SCENARIO_RESULTS_ELEMENT_NAME));
             List<UncertainPairedData> stageDamageList = new();
             foreach (XElement stageDamageElement in xElement.Element(STAGE_DAMAGE_LIST_ELEMENT_NAME).Elements())
             {

diff --git a/HEC.FDA.Model/metrics/IContainImpactAreaScenarioResults.cs b/HEC.FDA.Model/metrics/IContainImpactAreaScenarioResults.cs
diff --git a/HEC.FDA.Model/metrics/ImpactAreaScenarioResults.cs b/HEC.FDA.Model/metrics/ImpactAreaScenarioResults.cs
@@ -8,7 +8,7 @@
 
 namespace HEC.FDA.Model.metrics
 {
-    public class ImpactAreaScenarioResults : IContainImpactAreaScenarioResults
+    public class ImpactAreaScenarioResults
     {
         #region Properties 
         public PerformanceByThresholds PerformanceByThresholds { get; set; } //exposed publicly for testing
@@ -40,7 +40,6 @@ private ImpactAreaScenarioResults(PerformanceByThresholds performanceByThreshold
             IsNull = false;
         }
         #endregion
-
         #region Methods
         public double MeanAEP(int thresholdID)
         {

diff --git a/HEC.FDA.Model/metrics/ScenarioResults.cs b/HEC.FDA.Model/metrics/ScenarioResults.cs
@@ -21,7 +21,7 @@ public class ScenarioResults : ValidationErrorLogger
         public string ComputeDate { get; set; }
         public string SoftwareVersion { get; set; }
 
-        public List<IContainImpactAreaScenarioResults> ResultsList { get; } = new List<IContainImpactAreaScenarioResults>();
+        public List<ImpactAreaScenarioResults> ResultsList { get; } = new List<ImpactAreaScenarioResults>();
 
         #endregion
 
@@ -38,7 +38,7 @@ public List<int> GetImpactAreaIDs()
             List<int> impactAreaIDs = new();
             if (ResultsList.Count != 0)
             {
-                foreach (IContainImpactAreaScenarioResults containImpactAreaScenarioResults in ResultsList)
+                foreach (ImpactAreaScenarioResults containImpactAreaScenarioResults in ResultsList)
                 {
                     foreach (AggregatedConsequencesBinned consequenceResult in containImpactAreaScenarioResults.ConsequenceResults.ConsequenceResultList)
                     {
@@ -57,7 +57,7 @@ public List<string> GetAssetCategories()
             List<string> assetCats = new();
             if (ResultsList.Count != 0)
             {
-                foreach (IContainImpactAreaScenarioResults containImpactAreaScenarioResults in ResultsList)
+                foreach (ImpactAreaScenarioResults containImpactAreaScenarioResults in ResultsList)
                 {
                     foreach (AggregatedConsequencesBinned consequenceResult in containImpactAreaScenarioResults.ConsequenceResults.ConsequenceResultList)
                     {
@@ -77,7 +77,7 @@ public List<string> GetDamageCategories()
             List<string> damCats = new();
             if (ResultsList.Count != 0)
             {
-                foreach (IContainImpactAreaScenarioResults containImpactAreaScenarioResults in ResultsList)
+                foreach (ImpactAreaScenarioResults containImpactAreaScenarioResults in ResultsList)
                 {
                     foreach (AggregatedConsequencesBinned consequenceResult in containImpactAreaScenarioResults.ConsequenceResults.ConsequenceResultList)
                     {
@@ -356,7 +356,7 @@ public Empirical GetConsequencesDistribution(int impactAreaID = utilities.Intege
                 return Empirical.StackEmpiricalDistributions(empiricalDistsToStack, Empirical.Sum);
             }
         }
-        public void AddResults(IContainImpactAreaScenarioResults resultsToAdd)
+        public void AddResults(ImpactAreaScenarioResults resultsToAdd)
         { 
             ResultsList.Add(resultsToAdd);
         }
@@ -423,7 +423,7 @@ public static ScenarioResults ReadFromXML(XElement xElement)
 
             foreach (XElement element in xElement.Elements())
             {
-                IContainImpactAreaScenarioResults impactAreaScenarioResults = ImpactAreaScenarioResults.ReadFromXML(element);
+                ImpactAreaScenarioResults impactAreaScenarioResults = ImpactAreaScenarioResults.ReadFromXML(element);
                 scenarioResults.AddResults(impactAreaScenarioResults);
             }
 

diff --git a/HEC.FDA.Model/utilities/IntegerGlobalConstants.cs b/HEC.FDA.Model/utilities/IntegerGlobalConstants.cs
@@ -1,6 +1,6 @@
 namespace HEC.FDA.Model.utilities
 {
-    internal class IntegerGlobalConstants
+    public class IntegerGlobalConstants
     {
         public const int DEFAULT_MISSING_VALUE = -999;
     }