use IList instead of Collection

arup-group · Nov 29, 2023 · 1bfdfc8 · 1bfdfc8
1 parent 7a53cc0
commit 1bfdfc8
Show file tree

Hide file tree

Showing 110 changed files with 417 additions and 381 deletions.
diff --git a/GsaGH/Components/5_Results/BeamDerivedStresses.cs b/GsaGH/Components/5_Results/BeamDerivedStresses.cs
@@ -144,7 +144,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Stress1d[0]) {
-          foreach (KeyValuePair<int, Collection<IEntity1dDerivedStress>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IEntity1dDerivedStress>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outShearY.AddRange(kvp.Value[p - 1].Results.Values.Select(

diff --git a/GsaGH/Components/5_Results/BeamDisplacements.cs b/GsaGH/Components/5_Results/BeamDisplacements.cs
@@ -152,7 +152,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IEntity1dDisplacement>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IEntity1dDisplacement>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outTransX.AddRange(kvp.Value[p - 1].Results.Values.Select(

diff --git a/GsaGH/Components/5_Results/BeamForcesAndMoments.cs b/GsaGH/Components/5_Results/BeamForcesAndMoments.cs
@@ -178,7 +178,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IEntity1dInternalForce>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IEntity1dInternalForce>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outTransX.AddRange(kvp.Value[p - 1].Results.Values.Select(

diff --git a/GsaGH/Components/5_Results/BeamStrainEnergyDensity.cs b/GsaGH/Components/5_Results/BeamStrainEnergyDensity.cs
@@ -197,7 +197,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
           }
 
           if (_selectedItems[0] == "All") {
-            foreach (KeyValuePair<int, Collection<IEnergyDensity>> kvp in resultSet.Subset) {
+            foreach (KeyValuePair<int, IList<IEnergyDensity>> kvp in resultSet.Subset) {
               foreach (int p in permutations) {
                 var path = new GH_Path(result.CaseId, 
                   result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
@@ -225,7 +225,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
           }
 
           if (_selectedItems[0] == "All") {
-            foreach (KeyValuePair<int, Collection<IEntity1dStrainEnergyDensity>> kvp in resultSet.Subset) {
+            foreach (KeyValuePair<int, IList<IEntity1dStrainEnergyDensity>> kvp in resultSet.Subset) {
               foreach (int p in permutations) {
                 var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
                 outResults.AddRange(kvp.Value[p - 1].Results.Values.Select(

diff --git a/GsaGH/Components/5_Results/BeamStresses.cs b/GsaGH/Components/5_Results/BeamStresses.cs
@@ -179,7 +179,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Stress1d[0]) {
-          foreach (KeyValuePair<int, Collection<IEntity1dStress>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IEntity1dStress>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outAxial.AddRange(kvp.Value[p - 1].Results.Values.Select(

diff --git a/GsaGH/Components/5_Results/Element2dDisplacements.cs b/GsaGH/Components/5_Results/Element2dDisplacements.cs
@@ -148,7 +148,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IMeshQuantity<IDisplacement>>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IMeshQuantity<IDisplacement>>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outTransX.AddRange(kvp.Value[p - 1].Results().Select(

diff --git a/GsaGH/Components/5_Results/Element2dForcesAndMoments.cs b/GsaGH/Components/5_Results/Element2dForcesAndMoments.cs
@@ -217,7 +217,7 @@ IMeshResultSubset<IMeshQuantity<IForce2d>, IForce2d, ResultTensor2InAxis<Entity2
           Parallel.For(0, 3, thread => {
             switch (thread) {
               case 0:
-                foreach (KeyValuePair<int, Collection<IMeshQuantity<IForce2d>>> kvp in forces
+                foreach (KeyValuePair<int, IList<IMeshQuantity<IForce2d>>> kvp in forces
                  .Subset) {
                   foreach (int p in permutations) {
                     var path = new GH_Path(result.CaseId,
@@ -237,7 +237,7 @@ IMeshResultSubset<IMeshQuantity<IForce2d>, IForce2d, ResultTensor2InAxis<Entity2
                 break;
 
               case 1:
-                foreach (KeyValuePair<int, Collection<IMeshQuantity<IShear2d>>> kvp in shears
+                foreach (KeyValuePair<int, IList<IMeshQuantity<IShear2d>>> kvp in shears
                  .Subset) {
                   foreach (int p in permutations) {
                     var path = new GH_Path(result.CaseId,
@@ -254,7 +254,7 @@ IMeshResultSubset<IMeshQuantity<IForce2d>, IForce2d, ResultTensor2InAxis<Entity2
                 break;
 
               case 2:
-                foreach (KeyValuePair<int, Collection<IMeshQuantity<IMoment2d>>> kvp in moments
+                foreach (KeyValuePair<int, IList<IMeshQuantity<IMoment2d>>> kvp in moments
                  .Subset) {
                   foreach (int p in permutations) {
                     var path = new GH_Path(result.CaseId,

diff --git a/GsaGH/Components/5_Results/Element2dStresses.cs b/GsaGH/Components/5_Results/Element2dStresses.cs
@@ -162,7 +162,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IMeshQuantity<IStress>>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IMeshQuantity<IStress>>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outXx.AddRange(kvp.Value[p - 1].Results().Select(

diff --git a/GsaGH/Components/5_Results/Element3dDisplacements.cs b/GsaGH/Components/5_Results/Element3dDisplacements.cs
@@ -133,7 +133,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IMeshQuantity<ITranslation>>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IMeshQuantity<ITranslation>>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outTransX.AddRange(kvp.Value[p - 1].Results().Select(

diff --git a/GsaGH/Components/5_Results/Element3dStresses.cs b/GsaGH/Components/5_Results/Element3dStresses.cs
@@ -144,7 +144,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IMeshQuantity<IStress>>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IMeshQuantity<IStress>>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outXx.AddRange(kvp.Value[p - 1].Results().Select(

diff --git a/GsaGH/Components/5_Results/Member1dDisplacements.cs b/GsaGH/Components/5_Results/Member1dDisplacements.cs
@@ -150,7 +150,7 @@ IEntity1dResultSubset<IEntity1dDisplacement, IDisplacement, ResultVector6<Entity
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IEntity1dDisplacement>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IEntity1dDisplacement>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p,
                 kvp.Key);

diff --git a/GsaGH/Components/5_Results/Member1dForcesAndMoments.cs b/GsaGH/Components/5_Results/Member1dForcesAndMoments.cs
@@ -178,7 +178,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6Displacements[0]) {
-          foreach (KeyValuePair<int, Collection<IEntity1dInternalForce>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IEntity1dInternalForce>> kvp in resultSet.Subset) {
             foreach (int p in permutations) {
               var path = new GH_Path(result.CaseId, result.SelectedPermutationIds == null ? 0 : p, kvp.Key);
               outTransX.AddRange(kvp.Value[p - 1].Results.Values.Select(

diff --git a/GsaGH/Components/5_Results/SpringReactionForces.cs b/GsaGH/Components/5_Results/SpringReactionForces.cs
@@ -172,7 +172,7 @@ INodeResultSubset<IInternalForce, ResultVector6<NodeExtremaKey>> resultSet
         }
 
         if (_selectedItems[0] == ExtremaHelper.Vector6ReactionForces[0]) {
-          foreach (KeyValuePair<int, Collection<IInternalForce>> kvp in resultSet.Subset) {
+          foreach (KeyValuePair<int, IList<IInternalForce>> 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(_forceUnit)), path);

diff --git a/GsaGH/Components/6_Display/Contour1dResults.cs b/GsaGH/Components/6_Display/Contour1dResults.cs
@@ -626,8 +626,8 @@ protected override void SolveInternal(IGH_DataAccess da) {
         ? 0 : result.SelectedPermutationIds[0] - 1;
       double dmax = 0;
       double dmin = 0;
-      ConcurrentDictionary<int, List<IQuantity>> values = null;
-      ConcurrentDictionary<int, (List<double> x, List<double> y, List<double> z)> valuesXyz = null;
+      ConcurrentDictionary<int, IList<IQuantity>> values = null;
+      ConcurrentDictionary<int, (IList<double> x, IList<double> y, IList<double> z)> valuesXyz = null;
       switch (_mode) {
         case FoldMode.Displacement:
           IEntity1dResultSubset<IEntity1dDisplacement, IDisplacement, ResultVector6<Entity1dExtremaKey>> displacements = Quarterion.CoordinateTransformationTo(
@@ -890,7 +890,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
               dmax = averageStrainEnergies.GetExtrema(averageStrainEnergies.Max).EnergyDensity.As(_energyResultUnit);
               dmin = averageStrainEnergies.GetExtrema(averageStrainEnergies.Min).EnergyDensity.As(_energyResultUnit);
               positionsCount = 2;
-              values = new ConcurrentDictionary<int, List<IQuantity>>();
+              values = new ConcurrentDictionary<int, IList<IQuantity>>();
               Parallel.ForEach(averageStrainEnergies.Subset, kvp => values.TryAdd(kvp.Key, new List<IQuantity>() {
                   kvp.Value[permutation].EnergyDensity.ToUnit(_energyResultUnit),
                   kvp.Value[permutation].EnergyDensity.ToUnit(_energyResultUnit),

diff --git a/GsaGH/Components/6_Display/Contour2dResults.cs b/GsaGH/Components/6_Display/Contour2dResults.cs
@@ -613,8 +613,8 @@ protected override void SolveInternal(IGH_DataAccess da) {
       int permutation = result.SelectedPermutationIds == null
         ? 0 : result.SelectedPermutationIds[0] - 1;
 
-      ConcurrentDictionary<int, List<IQuantity>> values = null;
-      ConcurrentDictionary<int, (List<double> x, List<double> y, List<double> z)> valuesXyz = null;
+      ConcurrentDictionary<int, IList<IQuantity>> values = null;
+      ConcurrentDictionary<int, (IList<double> x, IList<double> y, IList<double> z)> valuesXyz = null;
 
       double dmax = 0;
       double dmin = 0;
@@ -838,7 +838,7 @@ INodeResultSubset<IFootfall, ResultFootfall<NodeExtremaKey>> nodeFootfall
         significantDigits = (int)rounded[2];
       }
 
-      var resultMeshes = new MeshResultGoo(new Mesh(), new List<List<IQuantity>>(),
+      var resultMeshes = new MeshResultGoo(new Mesh(), new List<IList<IQuantity>>(),
         new List<Point3dList>(), new List<int>());
       var meshes = new ConcurrentDictionary<int, Mesh>();
       meshes.AsParallel().AsOrdered();

diff --git a/GsaGH/Components/6_Display/Contour3dResults.cs b/GsaGH/Components/6_Display/Contour3dResults.cs
@@ -433,8 +433,8 @@ protected override void SolveInternal(IGH_DataAccess da) {
         ? 0 : result.SelectedPermutationIds[0] - 1;
       double dmax = 0;
       double dmin = 0;
-      ConcurrentDictionary<int, List<IQuantity>> values = null;
-      ConcurrentDictionary<int, (List<double> x, List<double> y, List<double> z)> valuesXyz = null;
+      ConcurrentDictionary<int, IList<IQuantity>> values = null;
+      ConcurrentDictionary<int, (IList<double> x, IList<double> y, IList<double> z)> valuesXyz = null;
       switch (_mode) {
         case FoldMode.Displacement:
           IMeshResultSubset<IMeshQuantity<ITranslation>, ITranslation,
@@ -542,7 +542,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
         significantDigits = (int)rounded[2];
       }
 
-      var resultMeshes = new MeshResultGoo(new Mesh(), new List<List<IQuantity>>(),
+      var resultMeshes = new MeshResultGoo(new Mesh(), new List<IList<IQuantity>>(),
         new List<Point3dList>(), new List<int>());
       var meshes = new ConcurrentDictionary<int, Mesh>();
       meshes.AsParallel().AsOrdered();

diff --git a/GsaGH/Components/6_Display/ReactionForceDiagrams.cs b/GsaGH/Components/6_Display/ReactionForceDiagrams.cs
@@ -327,7 +327,7 @@ private ToolStripMenuItem GenerateMomentUnitsMenu(string menuTitle) {
     }
 
     private (GsaVectorDiagram, GsaAnnotationGoo) CreateReactionForceVectorWithAnnotations(
-      KeyValuePair<int, GsaNodeGoo> node, IDictionary<int, Collection<IInternalForce>> forceValues,
+      KeyValuePair<int, GsaNodeGoo> node, IDictionary<int, IList<IInternalForce>> forceValues,
       int permutation, double scale, int significantDigits, Color color) {
       int nodeId = node.Key;
 

diff --git a/GsaGH/Helpers/Quarterion.cs b/GsaGH/Helpers/Quarterion.cs
@@ -4,14 +4,15 @@
 using Rhino.Geometry;
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace GsaGH.Helpers {
   public static class Quarterion {
-    internal static Entity1dDisplacements CoordinateTransformationTo(ConcurrentDictionary<int, Collection<IEntity1dDisplacement>> displacementSubset, Plane plane, Model model) {
-      var values = new ConcurrentDictionary<int, Collection<IEntity1dDisplacement>>();
+    internal static Entity1dDisplacements CoordinateTransformationTo(IDictionary<int, IList<IEntity1dDisplacement>> displacementSubset, Plane plane, Model model) {
+      var values = new ConcurrentDictionary<int, IList<IEntity1dDisplacement>>();
       Parallel.ForEach(displacementSubset, kvp => {
         var localAxes = new LocalAxes(model.ElementDirectionCosine(kvp.Key));
         var local = new Plane(Point3d.Origin, localAxes.X, localAxes.Y);

diff --git a/GsaGH/Parameters/5_Results/3_Caches/CacheUtility.cs b/GsaGH/Parameters/5_Results/3_Caches/CacheUtility.cs
@@ -4,8 +4,8 @@
 using System.Threading.Tasks;
 
 namespace GsaGH.Parameters.Results {
-  public static class CacheUtility {
-    public static ConcurrentBag<int> GetMissingKeys<T>(
+  internal static class CacheUtility {
+    internal static ConcurrentBag<int> GetMissingKeys<T>(
       this IDictionary<int, T> existing, ICollection<int> newKeys) {
       var missingIds = new ConcurrentBag<int>();
       Parallel.ForEach(newKeys, key => {
@@ -17,8 +17,8 @@ public static ConcurrentBag<int> GetMissingKeys<T>(
       return missingIds;
     }
 
-    public static ConcurrentBag<int> GetMissingKeys<T1, T2>(
-      this IDictionary<int, Collection<T1>> existing, ICollection<int> newKeys) {
+    internal static ConcurrentBag<int> GetMissingKeys<T1, T2>(
+      this IDictionary<int, IList<T1>> existing, ICollection<int> newKeys) {
       var missingIds = new ConcurrentBag<int>();
       Parallel.ForEach(newKeys, key => {
         if (!existing.ContainsKey(key)) {
@@ -29,8 +29,8 @@ public static ConcurrentBag<int> GetMissingKeys<T1, T2>(
       return missingIds;
     }
 
-    public static ConcurrentBag<int> GetMissingKeysAndPositions<T1, T2>(
-      this IDictionary<int, Collection<T1>> existing, ICollection<int> newKeys, ReadOnlyCollection<double> positions)
+    internal static ConcurrentBag<int> GetMissingKeysAndPositions<T1, T2>(
+      this IDictionary<int, IList<T1>> existing, ICollection<int> newKeys, ReadOnlyCollection<double> positions)
       where T1 : IEntity1dQuantity<T2> where T2 : IResultItem {
       var missingIds = new ConcurrentBag<int>();
       Parallel.ForEach(newKeys, key => {
@@ -49,7 +49,7 @@ public static ConcurrentBag<int> GetMissingKeysAndPositions<T1, T2>(
       return missingIds;
     }
 
-    public static ConcurrentDictionary<int, T> GetSubset<T>(this IDictionary<int, T> dictionary,
+    internal static IDictionary<int, T> GetSubset<T>(this IDictionary<int, T> dictionary,
       ICollection<int> keys) {
       var subset = new ConcurrentDictionary<int, T>();
       Parallel.ForEach(keys, key => {

diff --git a/GsaGH/Parameters/5_Results/3_Caches/Element1dAverageStrainEnergyDensityCache.cs b/GsaGH/Parameters/5_Results/3_Caches/Element1dAverageStrainEnergyDensityCache.cs
@@ -9,8 +9,8 @@ namespace GsaGH.Parameters.Results {
   public class Element1dAverageStrainEnergyDensityCache : INodeResultCache<IEnergyDensity, NodeExtremaKey> {
     public IApiResult ApiResult { get; set; }
 
-    public ConcurrentDictionary<int, Collection<IEnergyDensity>> Cache { get; }
-      = new ConcurrentDictionary<int, Collection<IEnergyDensity>>();
+    public IDictionary<int, IList<IEnergyDensity>> Cache { get; }
+      = new ConcurrentDictionary<int, IList<IEnergyDensity>>();
 
     internal Element1dAverageStrainEnergyDensityCache(AnalysisCaseResult result) {
       ApiResult = new ApiResult(result);
@@ -30,7 +30,8 @@ public INodeResultSubset<IEnergyDensity, NodeExtremaKey> ResultSubset(ICollectio
             ReadOnlyDictionary<int, double> aCaseResults = analysisCase.Element1dAverageStrainEnergyDensity(elementList, positions);
             Parallel.ForEach(aCaseResults.Keys, elementId => {
               var res = new StrainEnergyDensity(aCaseResults[elementId]);
-              Cache.TryAdd(elementId, new Collection<IEnergyDensity>() { res });
+              ((ConcurrentDictionary<int, IList<IEnergyDensity>>)Cache).TryAdd(
+                elementId, new Collection<IEnergyDensity>() { res });
             });
             break;
 
@@ -42,7 +43,8 @@ public INodeResultSubset<IEnergyDensity, NodeExtremaKey> ResultSubset(ICollectio
                 permutationResults.Add(new StrainEnergyDensity(permutationResult));
               }
 
-              Cache.TryAdd(elementId, permutationResults);
+              ((ConcurrentDictionary<int, IList<IEnergyDensity>>)Cache).TryAdd(
+                elementId, permutationResults);
             });
             break;
         }

diff --git a/GsaGH/Parameters/5_Results/3_Caches/Element1dDerivedStressCache.cs b/GsaGH/Parameters/5_Results/3_Caches/Element1dDerivedStressCache.cs
@@ -11,8 +11,8 @@ public class Element1dDerivedStressCache
     : IEntity1dResultCache<IEntity1dDerivedStress, IStress1dDerived, ResultDerivedStress1d<Entity1dExtremaKey>> {
     public IApiResult ApiResult { get; set; }
 
-    public ConcurrentDictionary<int, Collection<IEntity1dDerivedStress>> Cache { get; }
-      = new ConcurrentDictionary<int, Collection<IEntity1dDerivedStress>>();
+    public IDictionary<int, IList<IEntity1dDerivedStress>> Cache { get; }
+      = new ConcurrentDictionary<int, IList<IEntity1dDerivedStress>>();
 
     internal Element1dDerivedStressCache(AnalysisCaseResult result) {
       ApiResult = new ApiResult(result);
@@ -39,15 +39,17 @@ ConcurrentBag<int> missingIds
           case AnalysisCaseResult analysisCase:
             ReadOnlyDictionary<int, ReadOnlyCollection<DerivedStressResult1d>> aCaseResults
               = analysisCase.Element1dDerivedStress(elementList, positions);
-            Parallel.ForEach(aCaseResults.Keys, elementId => Cache.AddOrUpdate(
+            Parallel.ForEach(aCaseResults.Keys, elementId => 
+             ((ConcurrentDictionary<int, IList<IEntity1dDerivedStress>>)Cache).AddOrUpdate(
               elementId, Entity1dResultsFactory.CreateDerivedStresses(aCaseResults[elementId], positions),
               (key, oldValue) => oldValue.AddMissingPositions(aCaseResults[elementId], positions)));
             break;
 
           case CombinationCaseResult combinationCase:
             ReadOnlyDictionary<int, ReadOnlyCollection<ReadOnlyCollection<DerivedStressResult1d>>> cCaseResults
               = combinationCase.Element1dDerivedStress(elementList, positions);
-            Parallel.ForEach(cCaseResults.Keys, elementId => Cache.AddOrUpdate(
+            Parallel.ForEach(cCaseResults.Keys, elementId => 
+             ((ConcurrentDictionary<int, IList<IEntity1dDerivedStress>>)Cache).AddOrUpdate(
               elementId, Entity1dResultsFactory.CreateDerivedStresses(cCaseResults[elementId], positions),
               (key, oldValue) => oldValue.AddMissingPositions(cCaseResults[elementId], positions)));
             break;