GsaGH-407 extrema node displacement (#559)

GsaGH/Components/5_Results/Helpers/ExtremaHelper.cs

@@ -0,0 +1,49 @@
+using GsaGH.Parameters.Results;
+using System.Collections.ObjectModel;
+
+namespace GsaGH.Components.Helpers {
+  internal class ExtremaHelper {
+    internal static readonly ReadOnlyCollection<string> Vector6Displacements = new ReadOnlyCollection<string>(new[] {
+      "All",
+      "Max Ux",
+      "Max Uy",
+      "Max Uz",
+      "Max |U|",
+      "Max Rxx",
+      "Max Ryy",
+      "Max Rzz",
+      "Max |R|",
+      "Min Ux",
+      "Min Uy",
+      "Min Uz",
+      "Min |U|",
+      "Min Rxx",
+      "Min Ryy",
+      "Min Rzz",
+      "Min |R|",
+    });
+
+    internal static U ExtremaKey<T, U>(INodeResultSubset<T, ResultVector6<U>> resultSet, string key)
+      where T : IResultItem {
+      return key switch {
+        "Max Ux" => resultSet.Max.X,
+        "Max Uy" => resultSet.Max.Y,
+        "Max Uz" => resultSet.Max.Z,
+        "Max |U|" => resultSet.Max.Xyz,
+        "Max Rxx" => resultSet.Max.Xx,
+        "Max Ryy" => resultSet.Max.Yy,
+        "Max Rzz" => resultSet.Max.Zz,
+        "Max |R|" => resultSet.Max.Xxyyzz,
+        "Min Ux" => resultSet.Min.X,
+        "Min Uy" => resultSet.Min.Y,
+        "Min Uz" => resultSet.Min.Z,
+        "Min |U|" => resultSet.Min.Xyz,
+        "Min Rxx" => resultSet.Min.Xx,
+        "Min Ryy" => resultSet.Min.Yy,
+        "Min Rzz" => resultSet.Min.Zz,
+        "Min |R|" => resultSet.Min.Xxyyzz,
+        _ => throw new System.ArgumentException("Extrema case not found"),
+      };
+    }
+  }
+}

GsaGH/Components/5_Results/NodeDisplacements.cs

@@ -41,7 +41,7 @@ public NodeDisplacements() : base("Node Displacements", "NodeDisp",
 
     public override void SetSelected(int i, int j) {
       _selectedItems[i] = _dropDownItems[i][j];
-      _lengthUnit = (LengthUnit)UnitsHelper.Parse(typeof(LengthUnit), _selectedItems[i]);
+      _lengthUnit = (LengthUnit)UnitsHelper.Parse(typeof(LengthUnit), _selectedItems[1]);
       base.UpdateUI();
     }
 
@@ -56,12 +56,16 @@ public override void VariableParameterMaintenance() {
 
     protected override void InitialiseDropdowns() {
       _spacerDescriptions = new List<string>(new[] {
+        "Type",
         "Unit",
       });
 
       _dropDownItems = new List<List<string>>();
       _selectedItems = new List<string>();
 
+      _dropDownItems.Add(ExtremaHelper.Vector6Displacements.ToList());
+      _selectedItems.Add(_dropDownItems[0][0]);
+
       _dropDownItems.Add(UnitsHelper.GetFilteredAbbreviations(EngineeringUnits.Length));
       _selectedItems.Add(Length.GetAbbreviation(_lengthUnit));
 
@@ -77,7 +81,6 @@ protected override void RegisterInputParams(GH_InputParamManager pManager) {
 
     protected override void RegisterOutputParams(GH_OutputParamManager pManager) {
       string unitAbbreviation = Length.GetAbbreviation(_lengthUnit);
-
       string note = ResultNotes.NoteNodeResults;
 
       pManager.AddGenericParameter("Translations X [" + unitAbbreviation + "]", "Ux",
@@ -126,7 +129,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         ReadOnlyCollection<int> nodeIds = result.NodeIds(nodeList);
-        INodeResultSubset<IDisplacement, ResultVector6<NodeExtremaKey>> resultSet = 
+        INodeResultSubset<IDisplacement, ResultVector6<NodeExtremaKey>> resultSet =
           result.NodeDisplacements.ResultSubset(nodeIds);
 
         List<int> permutations = result.SelectedPermutationIds ?? new List<int>() {
@@ -146,20 +149,35 @@ protected override void SolveInternal(IGH_DataAccess da) {
         var outRotXyz = new DataTree<GH_UnitNumber>();
         var outIDs = new DataTree<int>();
 
-        Parallel.ForEach(resultSet.Subset, kvp => {
-          foreach (int p in permutations) {
-            var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p);
-            outTransX.Add(new GH_UnitNumber(kvp.Value[p - 1].X.ToUnit(_lengthUnit)), path);
-            outTransY.Add(new GH_UnitNumber(kvp.Value[p - 1].Y.ToUnit(_lengthUnit)), path);
-            outTransZ.Add(new GH_UnitNumber(kvp.Value[p - 1].Z.ToUnit(_lengthUnit)), path);
-            outTransXyz.Add(new GH_UnitNumber(kvp.Value[p - 1].Xyz.ToUnit(_lengthUnit)), path);
-            outRotX.Add(new GH_UnitNumber(kvp.Value[p - 1].Xx), path);
-            outRotY.Add(new GH_UnitNumber(kvp.Value[p - 1].Yy), path);
-            outRotZ.Add(new GH_UnitNumber(kvp.Value[p - 1].Zz), path);
-            outRotXyz.Add(new GH_UnitNumber(kvp.Value[p - 1].Xxyyzz), path);
-            outIDs.Add(kvp.Key, path);
+        if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
+          foreach (KeyValuePair<int, Collection<IDisplacement>> kvp in resultSet.Subset) {
+            foreach (int p in permutations) {
+              var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p);
+              outTransX.Add(new GH_UnitNumber(kvp.Value[p - 1].X.ToUnit(_lengthUnit)), path);
+              outTransY.Add(new GH_UnitNumber(kvp.Value[p - 1].Y.ToUnit(_lengthUnit)), path);
+              outTransZ.Add(new GH_UnitNumber(kvp.Value[p - 1].Z.ToUnit(_lengthUnit)), path);
+              outTransXyz.Add(new GH_UnitNumber(kvp.Value[p - 1].Xyz.ToUnit(_lengthUnit)), path);
+              outRotX.Add(new GH_UnitNumber(kvp.Value[p - 1].Xx), path);
+              outRotY.Add(new GH_UnitNumber(kvp.Value[p - 1].Yy), path);
+              outRotZ.Add(new GH_UnitNumber(kvp.Value[p - 1].Zz), path);
+              outRotXyz.Add(new GH_UnitNumber(kvp.Value[p - 1].Xxyyzz), path);
+              outIDs.Add(kvp.Key, path);
+            }
           }
-        });
+        } else {
+          NodeExtremaKey key = ExtremaHelper.ExtremaKey(resultSet, _selectedItems[0]);
+          IDisplacement extrema = resultSet.GetExtrema(key);
+          var path = new GH_Path(result.CaseId, key.Permutation);
+          outTransX.Add(new GH_UnitNumber(extrema.X.ToUnit(_lengthUnit)), path);
+          outTransY.Add(new GH_UnitNumber(extrema.Y.ToUnit(_lengthUnit)), path);
+          outTransZ.Add(new GH_UnitNumber(extrema.Z.ToUnit(_lengthUnit)), path);
+          outTransXyz.Add(new GH_UnitNumber(extrema.Xyz.ToUnit(_lengthUnit)), path);
+          outRotX.Add(new GH_UnitNumber(extrema.Xx), path);
+          outRotY.Add(new GH_UnitNumber(extrema.Yy), path);
+          outRotZ.Add(new GH_UnitNumber(extrema.Zz), path);
+          outRotXyz.Add(new GH_UnitNumber(extrema.Xxyyzz), path);
+          outIDs.Add(key.Id, path);
+        }
 
         da.SetDataTree(0, outTransX);
         da.SetDataTree(1, outTransY);
@@ -176,7 +194,13 @@ protected override void SolveInternal(IGH_DataAccess da) {
     }
 
     protected override void UpdateUIFromSelectedItems() {
-      _lengthUnit = (LengthUnit)UnitsHelper.Parse(typeof(LengthUnit), _selectedItems[0]);
+      if (_selectedItems.Count == 1) {
+        _spacerDescriptions.Insert(0, "Type");
+        _dropDownItems.Insert(0, ExtremaHelper.Vector6Displacements.ToList());
+        _selectedItems.Insert(0, _dropDownItems[0][0]);
+      }
+
+      _lengthUnit = (LengthUnit)UnitsHelper.Parse(typeof(LengthUnit), _selectedItems[1]);
       base.UpdateUIFromSelectedItems();
     }
   }

GsaGH/Parameters/5_Results/5_Extrema/NodeExtremaKeyUtility.cs → GsaGH/Parameters/5_Results/5_Extrema/ExtremaKeyUtility.cs

@@ -4,7 +4,7 @@
 using OasysUnits;
 
 namespace GsaGH.Parameters.Results {
-  public static class NodeExtremaKeyUtility {
+  public static class ExtremaKeyUtility {
     public static (ResultVector6<NodeExtremaKey> Max, ResultVector6<NodeExtremaKey> Min) Extrema<T>(
       this IDictionary<int, Collection<T>> subset) {
 
@@ -22,6 +22,11 @@ public static (ResultVector6<NodeExtremaKey> Max, ResultVector6<NodeExtremaKey>
               UpdateExtrema<IDisplacement, Length, Angle>(displacement, nodeId, permutation,
                 ref maxValue, ref minValue, ref maxKey, ref minKey);
               break;
+
+            case IInternalForce internalForce:
+              UpdateExtrema<IInternalForce, Force, Moment>(internalForce, nodeId, permutation,
+                ref maxValue, ref minValue, ref maxKey, ref minKey);
+              break;
           }
         }
       }

GsaGH/Parameters/5_Results/5_Extrema/ResultVector6.cs

@@ -20,7 +20,7 @@ public ResultVector6() {
     }
 
     public ResultVector6(T initialValue) {
-        X = initialValue;
+      X = initialValue;
       Y = initialValue;
       Z = initialValue;
       Xyz = initialValue;

GsaGHTests/3_Components/ComponentsTests.cs

@@ -55,7 +55,7 @@ public class ComponentsTests {
     [InlineData(typeof(Element3dStresses), 1)]
     [InlineData(typeof(GlobalPerformanceResults), 3)]
     [InlineData(typeof(ContourNodeResults), 2)]
-    [InlineData(typeof(NodeDisplacements), 1)]
+    [InlineData(typeof(NodeDisplacements), 2)]
     [InlineData(typeof(ReactionForces), 2)]
     [InlineData(typeof(ReactionForceDiagrams), 1)]
     [InlineData(typeof(SelectResult), 2)]
@@ -130,7 +130,7 @@ public void WhenInitialiseDropdowns_ThenDropDownItems_ShouldBeNull(Type t) {
     [InlineData(typeof(Element3dStresses), "MPa", "kipf/ft²")]
     [InlineData(typeof(GlobalPerformanceResults), "t", "slug")]
     [InlineData(typeof(ContourNodeResults), "Displacement", "Footfall")]
-    [InlineData(typeof(NodeDisplacements), "mm", "ft")]
+    [InlineData(typeof(NodeDisplacements), "All", "Min |R|")]
     [InlineData(typeof(ReactionForces), "kN", "tf")]
     [InlineData(typeof(ReactionForceDiagrams), "Resolved |F|", "Resolved |M|")]
     [InlineData(typeof(SelectResult), "AnalysisCase", "Combination")]