feat: add support for GsaList (reduced scope) (SPEC-460, SPEC-494)

ConnectorGSA/ConnectorGSATests/SchemaTests.cs

@@ -377,7 +377,7 @@ public void GsaListSimple()
 
       // Equal checks on first list only
       Assert.Equal("sampleOne", gsaLists[0].Name);
-      Assert.Equal("MEMBER", gsaLists[0].Type);
+      Assert.Equal(ListType.Member, gsaLists[0].Type);
       Assert.True(new List<int>() { 1, 2, 4, 5, 6, 7, 8 }.SequenceEqual(gsaLists[0].Definition));
     }
 
@@ -3120,6 +3120,62 @@ public void GsaUserVehicleSimple()
       }
     }
     #endregion
+
+    [Fact]
+    public void GsaListGwa_WithEmptyDefinition_ReturnsTrue()
+    {
+      var listGwas = new List<string>()
+      {
+        "LIST.1\t3\tmemb list\tMEMBER\t"
+      };
+
+      var parser = new GsaListParser();
+
+      Assert.True(parser.FromGwa(listGwas[0]));
+
+      var record = (GsaList)parser.Record;
+
+      Assert.Equal("memb list", record.Name);
+      Assert.Equal(ListType.Member, record.Type);
+      Assert.Equal(new List<int>(), record.Definition);
+    }
+
+    [Fact]
+    public void GsaList_WithValidParameters_CreatesValidGwa()
+    {
+      var gsaList = new GsaList();
+      gsaList.Index = 1;
+      gsaList.Name = "TestList";
+      gsaList.Type = ListType.Node;
+      gsaList.Definition = new List<int>() { 1, 3, 4, 5, 2, 20 };
+
+      var listParser = new GsaListParser(gsaList);
+
+      var isParsed = listParser.Gwa(out var gwas);
+
+      var expectedResult = $"LIST.1\t1\tTestList\tNODE\t1 3 4 5 2 20";
+
+      Assert.True(isParsed);
+      Assert.NotEmpty(gwas);
+      Assert.Equal(expectedResult, gwas[0]);
+    }
+
+    [Fact]
+    public void GsaList_WithEmptyName_DoesNotParse()
+    {
+      var gsaList = new GsaList();
+      gsaList.Index = 1;
+      gsaList.Type = ListType.Node;
+      gsaList.Definition = new List<int>() { 1, 3, 4, 5, 2, 20 };
+
+      var listParser = new GsaListParser(gsaList);
+
+      var isParsed = listParser.Gwa(out var gwas);
+
+      Assert.False(isParsed);
+      Assert.Empty(gwas);
+    }
+
     #endregion
 
     #region data_gen_fns

ConnectorGSA/GSAProxy/Cache/GsaCache.cs

@@ -380,18 +380,18 @@ public bool GetNativesFilteredByList(out List<GsaRecord> gsaRecords, List<string
         {
           var precendentRecords = new List<GsaRecord>();
 
-          switch (listRecord.Type.ToUpper())
+          switch (listRecord.Type)
           {
-            case "MEMBER":
+            case ListType.Member:
               GetPrecedentNatives<GsaMemb>(listRecord.Definition, out precendentRecords);
               break;
-            case "ELEMENT":
+            case ListType.Element:
               GetPrecedentNatives<GsaEl>(listRecord.Definition, out precendentRecords);
               break;
-            case "NODE":
+            case ListType.Node:
               GetPrecedentNatives<GsaNode>(listRecord.Definition, out precendentRecords);
               break;
-            case "CASE":
+            case ListType.Case:
               GetPrecedentNatives<GsaLoadCase>(listRecord.Definition, out precendentRecords);
               break;
             default:

ConnectorGSA/GSAProxy/GsaProxy.cs

@@ -1119,7 +1119,7 @@ public bool GetGwaData(GSALayer layer, ProgressViewModel progress, out List<GsaR
                 }
                 else if (progress != null)
                 {
-                  progress.Report.LogOperationError(new Exception(FormulateParsingErrorContext(parser.Record, schemaType.Name)));
+                  progress.Report.LogConversionError(new Exception(FormulateParsingErrorContext(parser.Record, schemaType.Name)));
                 }
               }
             }
@@ -1249,7 +1249,7 @@ public bool GetGwaData(GSALayer layer, ProgressViewModel progress, out List<GsaR
                     }
                     else if (progress != null)
                     {
-                      progress.Report.LogOperationError(new Exception(FormulateParsingErrorContext(parser.Record, schemaType.Name)));
+                      progress.Report.LogConversionError(new Exception(FormulateParsingErrorContext(parser.Record, schemaType.Name)));
                     }
                   }
                 }
@@ -1370,7 +1370,7 @@ public bool GetGwaData(GSALayer layer, ProgressViewModel progress, out List<GsaR
                 }
                 else if (progress != null)
                 {
-                  progress.Report.LogOperationError(new Exception(FormulateParsingErrorContext(parser.Record, schemaType.Name)));
+                  progress.Report.LogConversionError(new Exception(FormulateParsingErrorContext(parser.Record, schemaType.Name)));
                 }
               }
             }

ConnectorGSA/GSAProxy/GwaParsers/GeneralData/GsaListParser.cs

@@ -1,4 +1,5 @@
-using Speckle.GSA.API.GwaSchema;
+using Speckle.GSA.API;
+using Speckle.GSA.API.GwaSchema;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,24 +21,40 @@ public override bool FromGwa(string gwa)
         return false;
       }
 
-      var items = remainingItems;
+      // Ensure record.Type correctly set
+      FromGwaByFuncs(remainingItems, out remainingItems, AddName, (v) => v.TryParseStringValue(out record.Type)); 
 
-      if (items[1] == "MEMBER")
-        FromGwaByFuncs(items, out remainingItems, AddName, AddType, (v) => AddEntities(v, GSA.API.GSALayer.Design, out record.Definition));
-
-      else if (items[1] == "NODE") // Add nodes currently gets all nodes only.
-        FromGwaByFuncs(items, out remainingItems, AddName, AddType, (v) => AddNodes(v, out record.Definition));
-
-      // Element, Case
+      if (record.Type == ListType.Node)
+      {
+        FromGwaByFuncs(remainingItems, out remainingItems, (v) => AddNodes(v, out record.Definition));
+      }
       else
-        FromGwaByFuncs(items, out remainingItems, AddName, AddType, (v) => AddEntities(v, GSA.API.GSALayer.Analysis, out record.Definition));
+      {
+        var gsaLayer = record.Type == ListType.Member ? GSALayer.Design : GSALayer.Analysis;
+        FromGwaByFuncs(remainingItems, out remainingItems, (v) => AddEntities(v, gsaLayer, out record.Definition));
+      }
 
-        return true;
+      // Record with null definition determined invalid. Record will still be valid and converted if definition is empty.
+      return record.Definition != null;
     }
 
     public override bool Gwa(out List<string> gwa, bool includeSet = false)
     {
-      throw new NotImplementedException();
+      gwa = new List<string>();
+
+      if (!InitialiseGwa(includeSet, out var items) || string.IsNullOrEmpty(record.Name))
+        return false;
+
+      // LIST.1 | num | name | type | list (definition)
+      var allItemsAdded = AddItems(ref items, record.Name, record.Type.GetStringValue(), string.Join(" ", record.Definition));
+
+      if (!allItemsAdded)
+        return false;
+
+      if (Join(items, out var gwaLine))
+        gwa.Add(gwaLine);
+
+      return gwa.Count > 0;
     }
 
     #region From GWA
@@ -46,14 +63,6 @@ protected bool AddName(string v)
       record.Name = (string.IsNullOrEmpty(v)) ? null : v;
       return true;
     }
-
-    protected bool AddType(string v)
-    {
-      record.Type = (string.IsNullOrEmpty(v)) ? null : v;
-      return true;
-    }
-
     #endregion
-
   }
 }

ConnectorGSA/Speckle.GSA.API/GwaSchema/Enums.cs

@@ -1056,4 +1056,18 @@ public enum UnitDimension
     [StringValue("STRAIN")]
     Strain
   }
+
+  public enum ListType
+  {
+    [StringValue("NODE")]
+    Node,
+    [StringValue("ELEMENT")]
+    Element,
+    [StringValue("MEMBER")]
+    Member,
+    [StringValue("CASE")]
+    Case,
+    [StringValue("UNDEF")]
+    Unspecified
+  }
 }

ConnectorGSA/Speckle.GSA.API/GwaSchema/GeneralData/GsaList.cs

@@ -9,7 +9,7 @@ namespace Speckle.GSA.API.GwaSchema
   public class GsaList : GsaRecord
   {
     public string Name { get => name; set { name = value; } }
-    public string Type;
+    public ListType Type;
     public List<int> Definition;
 
     public GsaList() : base()

ConnectorGrasshopper/ConnectorGrasshopperShared/SchemaBuilder/SchemaBuilderGen.cs

@@ -2834,7 +2834,7 @@ static GSAListSchemaComponent() {
             proxy.Exposure = internalExposure;
           };
     }
-    public GSAListSchemaComponent(): base("GSAList", "GSAList", "Creates a Speckle object for a GSA List", "Speckle 2 GSA", "General Data") { }
+    public GSAListSchemaComponent(): base("GSAList", "GSAList", "Creates a Speckle object for a GSA List (to be used for defining GSA lists and receiving into GSA only, not as input to other objects/components)", "Speckle 2 GSA", "General Data") { }
 
     internal static string internalCategory { get; }  = "Speckle 2 GSA";
 
@@ -4616,7 +4616,7 @@ public ModelSchemaComponent(): base("Model", "Model", "Creates a Speckle structu
       : GH_Exposure.hidden;
 
     public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.Model.ctor(Objects.Structural.Analysis.ModelInfo,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.Analysis.Model");
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Analysis.Model.ctor(Objects.Structural.Analysis.ModelInfo,System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base],System.Collections.Generic.List`1[Speckle.Core.Models.Base])","Objects.Structural.Analysis.Model");
         base.AddedToDocument(document);
     }
 }
@@ -6073,7 +6073,7 @@ static ResultSetAllSchemaComponent() {
       : GH_Exposure.hidden;
 
     public override void AddedToDocument(GH_Document document){
-        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSetAll.ctor(Objects.Structural.Results.ResultSet1D,Objects.Structural.Results.ResultSet2D,Objects.Structural.Results.ResultSet3D,Objects.Structural.Results.ResultGlobal,Objects.Structural.Results.ResultSetNode)","Objects.Structural.Results.ResultSetAll");
+        SelectedConstructor = CSOUtils.FindConstructor("Objects.Structural.Results.ResultSetAll.ctor(Objects.Structural.Results.ResultSet1D,Objects.Structural.Results.ResultSet2D,Objects.Structural.Results.ResultSet3D,Objects.Structural.Results.ResultSetGlobal,Objects.Structural.Results.ResultSetNode)","Objects.Structural.Results.ResultSetAll");
         base.AddedToDocument(document);
     }
 }