diff --git a/GsaGH/Parameters/5_Results/GsaAnalysisCaseResult.cs b/GsaGH/Parameters/5_Results/GsaAnalysisCaseResult.cs index 4e038ee66..48ba37652 100644 --- a/GsaGH/Parameters/5_Results/GsaAnalysisCaseResult.cs +++ b/GsaGH/Parameters/5_Results/GsaAnalysisCaseResult.cs @@ -45,7 +45,7 @@ public class GsAnalysisCaseResult : IGsaResult { - internal Dictionary NodeDisplacementValues { get; set; } = new Dictionary(); + internal Dictionary NodeDisplacementValues { get; set; } = new Dictionary(); @@ -60,8 +60,6 @@ public class GsAnalysisCaseResult : IGsaResult { public CaseType Type { get; } = CaseType.AnalysisCase; - CaseType IGsaResult.Type => throw new NotImplementedException(); - public GsAnalysisCaseResult() { } internal GsAnalysisCaseResult(GsaModel model, AnalysisCaseResult result, int caseId) { @@ -75,21 +73,35 @@ public GsaResultsValues GetNodeDisplacementValues(string nodelist, LengthUnit le if (nodelist.ToLower() == "all" || nodelist == string.Empty) { nodelist = "All"; } - if (!NodeDisplacementValues.ContainsKey(nodelist)) { - if (!ACaseNodeResults.ContainsKey(nodelist)) { - ACaseNodeResults.Add(nodelist, AnalysisCaseResult.NodeResults(nodelist)); - } - - NodeDisplacementValues.Add(nodelist, - ResultHelper.GetNodeResultValues(ACaseNodeResults[nodelist], lengthUnit)); + if (!NodeDisplacementValues.ContainsKey(nodelist)) { + if (!ACaseNodeResults.ContainsKey(nodelist)) { + ACaseNodeResults.Add(nodelist, AnalysisCaseResult.NodeResults(nodelist)); } + NodeDisplacementValues.Add(nodelist, + ResultHelper.GetNodeResultValues(ACaseNodeResults[nodelist], lengthUnit)); + + + + } + return NodeDisplacementValues[nodelist]; } + protected ReadOnlyDictionary> GetAnalysisCaseNodeResults(string nodelist) { + + + ReadOnlyDictionary values = AnalysisCaseResult.NodeResults(nodelist); + + var result = new ReadOnlyDictionary>(values); + } + + protected ReadOnlyDictionary> GetCombinationCaseNodeResults(string nodelist) { + + } public GsAnalysisCaseResult Duplicate() { return this; diff --git a/GsaGH/Parameters/5_Results/IGsaResult.cs b/GsaGH/Parameters/5_Results/IGsaResult.cs index a73c9fb29..2b07c956e 100644 --- a/GsaGH/Parameters/5_Results/IGsaResult.cs +++ b/GsaGH/Parameters/5_Results/IGsaResult.cs @@ -1,10 +1,11 @@ -using OasysUnits.Units; +using System.Collections.Concurrent; +using OasysUnits.Units; namespace GsaGH.Parameters { public interface IGsaResult { CaseType Type { get; } - //GsaResultsValues GetNodeDisplacementValues(string nodelist, LengthUnit lengthUnit); + ConcurrentDictionary GetNodeDisplacementValues(string nodelist, LengthUnit lengthUnit); // etc. }