Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r8e213638a22dd9f04d965d875bb58156db019be5 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs (.../HydraulicLocationOutputEntityReadExtensionsTest.cs) (revision 8e213638a22dd9f04d965d875bb58156db019be5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs (.../HydraulicLocationOutputEntityReadExtensionsTest.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -167,13 +167,14 @@ } private static void AssertIllustrationPoints( - IList entities, - IList illustrationPoints) + IEnumerable entities, + IEnumerable illustrationPoints) { - Assert.AreEqual(entities.Count, illustrationPoints.Count); - for (var i = 0; i < entities.Count; i++) + int expectedEntitiesCount = entities.Count(); + Assert.AreEqual(expectedEntitiesCount, illustrationPoints.Count()); + for (var i = 0; i < expectedEntitiesCount; i++) { - AssertTopLevelSubMechanismIllustrationPoint(entities[i], illustrationPoints[i]); + AssertTopLevelSubMechanismIllustrationPoint(entities.ElementAt(i), illustrationPoints.ElementAt(i)); } } @@ -190,12 +191,13 @@ Assert.IsNotNull(readTopLevelSubMechanismIllustrationPoint.SubMechanismIllustrationPoint); } - private static void AssertStochasts(IList entities, IList stochasts) + private static void AssertStochasts(IEnumerable entities, IEnumerable stochasts) { - Assert.AreEqual(entities.Count, stochasts.Count); - for (var i = 0; i < entities.Count; i++) + int expectedEntitiesCount = entities.Count(); + Assert.AreEqual(expectedEntitiesCount, stochasts.Count()); + for (var i = 0; i < expectedEntitiesCount; i++) { - AssertStochast(entities[i], stochasts[i]); + AssertStochast(entities.ElementAt(i), stochasts.ElementAt(i)); } } Index: Core/Common/src/Core.Common.Base/Geometry/Math2D.cs =================================================================== diff -u -r0ec4972fb80e931795d6d60fc659169b558ea28d -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision 0ec4972fb80e931795d6d60fc659169b558ea28d) +++ Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -523,12 +523,12 @@ return splitResults; } - private static void EnsureLastSplitResultHasEndPointOfLine(List subLine, IList lineSegments) + private static void EnsureLastSplitResultHasEndPointOfLine(List subLine, IEnumerable lineSegments) { - int lastSegmentIndex = lineSegments.Count - 1; - if (!subLine.Contains(lineSegments[lastSegmentIndex].SecondPoint)) + int lastSegmentIndex = lineSegments.Count() - 1; + if (!subLine.Contains(lineSegments.ElementAt(lastSegmentIndex).SecondPoint)) { - subLine.Add(lineSegments[lastSegmentIndex].SecondPoint); + subLine.Add(lineSegments.ElementAt(lastSegmentIndex).SecondPoint); } } Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs =================================================================== diff -u -re2892835ceb1c916be9a9122ba372858f20b981a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs (.../DataGridViewControl.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a) +++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs (.../DataGridViewControl.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -350,7 +350,7 @@ /// The data source to set. /// Providing a value of null for /// will clear the grid view. - public void SetDataSource(IList dataSource) + public void SetDataSource(IEnumerable dataSource) { dataGridView.DataSource = dataSource; } Index: Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs (.../PropertyGridView.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs (.../PropertyGridView.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -20,7 +20,7 @@ // All rights reserved. using System; -using System.Collections; +using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Security.Permissions; @@ -173,7 +173,7 @@ root = root.Parent; } // Find all expanded items and put them in a list. - var items = new ArrayList(); + var items = new List(); AddExpandedItems(root, items); // Find selectedItem. @@ -185,7 +185,7 @@ { foundIndex = items.Count - 1; } - SelectedGridItem = (GridItem) items[foundIndex]; + SelectedGridItem = items[foundIndex]; if (SelectedGridItem.GridItems.Count > 0) { SelectedGridItem.Expanded = false; @@ -200,7 +200,7 @@ { foundIndex = 0; } - SelectedGridItem = (GridItem) items[foundIndex]; + SelectedGridItem = items[foundIndex]; } if (SelectedGridItem.GridItems.Count > 0) { @@ -213,7 +213,7 @@ return base.ProcessCmdKey(ref msg, keyData); } - private static void AddExpandedItems(GridItem parent, IList items) + private static void AddExpandedItems(GridItem parent, List items) { if (parent.PropertyDescriptor != null) { Index: Core/Common/test/Core.Common.TestUtil/DataGridViewTestHelper.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Common/test/Core.Common.TestUtil/DataGridViewTestHelper.cs (.../DataGridViewTestHelper.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Common/test/Core.Common.TestUtil/DataGridViewTestHelper.cs (.../DataGridViewTestHelper.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -20,9 +20,9 @@ // All rights reserved. using System; -using System.Collections; using System.Collections.Generic; using System.Drawing; +using System.Linq; using System.Windows.Forms; using Core.Common.Utils.Reflection; using NUnit.Framework; @@ -41,13 +41,14 @@ /// The view. /// Thrown when a column does not have the /// expected header text or there is a mismatch in the number of columns. - public static void AssertExpectedHeaders(IList expectedHeaderNames, DataGridView actualDataGridView) + public static void AssertExpectedHeaders(IEnumerable expectedHeaderNames, DataGridView actualDataGridView) { - Assert.AreEqual(expectedHeaderNames.Count, actualDataGridView.ColumnCount); - for (var i = 0; i < expectedHeaderNames.Count; i++) + int expectedHeaderNamesCount = expectedHeaderNames.Count(); + Assert.AreEqual(expectedHeaderNamesCount, actualDataGridView.ColumnCount); + for (var i = 0; i < expectedHeaderNamesCount; i++) { DataGridViewColumn column = actualDataGridView.Columns[i]; - Assert.AreEqual(expectedHeaderNames[i], column.HeaderText); + Assert.AreEqual(expectedHeaderNames.ElementAt(i), column.HeaderText); } } @@ -58,15 +59,17 @@ /// The view. /// Thrown when a column is not of the /// expected class or there is a mismatch in the number of columns. - public static void AssertColumnTypes(IList expectedColumnTypes, DataGridView actualDataGridView) + public static void AssertColumnTypes(IEnumerable expectedColumnTypes, DataGridView actualDataGridView) { - Assert.AreEqual(expectedColumnTypes.Count, actualDataGridView.ColumnCount); - for (var i = 0; i < expectedColumnTypes.Count; i++) + int expectedColumnTypesCount = expectedColumnTypes.Count(); + Assert.AreEqual(expectedColumnTypesCount, actualDataGridView.ColumnCount); + for (var i = 0; i < expectedColumnTypesCount; i++) { DataGridViewColumn column = actualDataGridView.Columns[i]; - Assert.True(column.GetType().Implements(expectedColumnTypes[i]), + Type expectedColumnType = expectedColumnTypes.ElementAt(i); + Assert.True(column.GetType().Implements(expectedColumnType), "Column type mismatch." + Environment.NewLine + - $"Expected: {expectedColumnTypes[i].FullName}" + Environment.NewLine + + $"Expected: {expectedColumnType.FullName}" + Environment.NewLine + $"Actual: {column.GetType().FullName}"); } } @@ -78,14 +81,15 @@ /// The row. /// Thrown when a cell does not have the /// expected formatted value or there is a mismatch in the number of cells in the row. - public static void AssertExpectedRowFormattedValues(IList expectedFormattedValues, DataGridViewRow actualRow) + public static void AssertExpectedRowFormattedValues(IEnumerable expectedFormattedValues, DataGridViewRow actualRow) { DataGridViewCellCollection rowCells = actualRow.Cells; - Assert.AreEqual(expectedFormattedValues.Count, rowCells.Count); - for (var i = 0; i < expectedFormattedValues.Count; i++) + int expectedFormattedValuesCount = expectedFormattedValues.Count(); + Assert.AreEqual(expectedFormattedValuesCount, rowCells.Count); + for (var i = 0; i < expectedFormattedValuesCount; i++) { DataGridViewCell cell = rowCells[i]; - Assert.AreEqual(expectedFormattedValues[i], cell.FormattedValue); + Assert.AreEqual(expectedFormattedValues.ElementAt(i), cell.FormattedValue); } } Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs =================================================================== diff -u -r9649e55312348f856051d40881b4e902b1a15a3b -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 9649e55312348f856051d40881b4e902b1a15a3b) +++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -219,14 +219,11 @@ private void InitializeTree(Control control) { - IList itemsToShow = new ArrayList + var itemsToShow = new List { control }; - foreach (object o in PropertyObjects) - { - itemsToShow.Add(o); - } + itemsToShow.AddRange(PropertyObjects); treeView1.ImageList = new ImageList { @@ -240,7 +237,7 @@ treeView1.NodeMouseClick += delegate { PropertyGrid.SelectedObject = treeView1.SelectedNode.Tag; }; } - private void AddAllNodes(TreeNodeCollection nodes, IEnumerable itemsToShow) + private static void AddAllNodes(TreeNodeCollection nodes, IEnumerable itemsToShow) { foreach (object item in itemsToShow.Cast().Where(i => i != null)) { Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs (.../BruTileLayer.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs (.../BruTileLayer.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -217,9 +217,9 @@ { if (targetProjectionInfo != null) { - targetProjection = targetProjectionInfo.Equals(sourceProjection) ? - null : - targetProjectionInfo; + targetProjection = targetProjectionInfo.Equals(sourceProjection) + ? null + : targetProjectionInfo; } else { @@ -236,9 +236,9 @@ return; } - IEnumerable regionsToDraw = regions.Any() ? - (IEnumerable) regions : - new[] + IEnumerable regionsToDraw = regions.Any() + ? (IEnumerable) regions + : new[] { args.GeographicExtents }; @@ -285,7 +285,7 @@ tileFetcher.DropAllPendingTileRequests(); - IList tiles = Sort(schema.GetTileInfos(extent, level), geoExtent.Center); + IEnumerable tiles = Sort(schema.GetTileInfos(extent, level), geoExtent.Center); DrawTilesAtCurrentLevel(args, tiles, schema); } } @@ -350,9 +350,9 @@ { // For WMTS, 'spatialReferenceSystemString' might be some crude value (urn-string): string authorityCode = ToAuthorityCode(spatialReferenceSystemString); - projectionInfo = !string.IsNullOrWhiteSpace(authorityCode) ? - AuthorityCodeHandler.Instance[authorityCode] : - null; + projectionInfo = !string.IsNullOrWhiteSpace(authorityCode) + ? AuthorityCodeHandler.Instance[authorityCode] + : null; } } @@ -486,7 +486,7 @@ /// The point used to order based on distance. /// /// Subsequent equidistant tiles are ordered to occur first. - private static IList Sort(IEnumerable tileInfos, Coordinate focusPoint) + private static IEnumerable Sort(IEnumerable tileInfos, Coordinate focusPoint) { var sortResult = new SortedList(); foreach (TileInfo tileInfo in tileInfos) Index: Core/Components/src/Core.Components.Gis.IO/Readers/PointShapeFileReader.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/src/Core.Components.Gis.IO/Readers/PointShapeFileReader.cs (.../PointShapeFileReader.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/src/Core.Components.Gis.IO/Readers/PointShapeFileReader.cs (.../PointShapeFileReader.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -143,13 +143,14 @@ }; } - private FeatureBasedMapData ConvertPointFeaturesToMapPointData(IList featureList, string name) + private FeatureBasedMapData ConvertPointFeaturesToMapPointData(IEnumerable featureList, string name) { - var mapFeatures = new MapFeature[featureList.Count]; + int featureListCount = featureList.Count(); + var mapFeatures = new MapFeature[featureListCount]; - for (var i = 0; i < featureList.Count; i++) + for (var i = 0; i < featureListCount; i++) { - IFeature feature = featureList[i]; + IFeature feature = featureList.ElementAt(i); MapFeature mapFeature = CreateMapFeatureForPointFeature(feature); CopyMetaDataIntoFeature(mapFeature, i); Index: Core/Components/src/Core.Components.Gis.IO/Readers/PolygonShapeFileReader.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/src/Core.Components.Gis.IO/Readers/PolygonShapeFileReader.cs (.../PolygonShapeFileReader.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/src/Core.Components.Gis.IO/Readers/PolygonShapeFileReader.cs (.../PolygonShapeFileReader.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -138,13 +138,14 @@ }; } - private FeatureBasedMapData ConvertPolygonFeaturesToMapPointData(IList featureList, string name) + private FeatureBasedMapData ConvertPolygonFeaturesToMapPointData(IEnumerable featureList, string name) { - var mapFeatures = new MapFeature[featureList.Count]; + int featureListCount = featureList.Count(); + var mapFeatures = new MapFeature[featureListCount]; - for (var i = 0; i < featureList.Count; i++) + for (var i = 0; i < featureListCount; i++) { - IFeature feature = featureList[i]; + IFeature feature = featureList.ElementAt(i); MapFeature mapFeature = CreateMapFeatureForPolygonFeature(feature); CopyMetaDataIntoFeature(mapFeature, i); Index: Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -147,13 +147,14 @@ }; } - private MapLineData ConvertMultiLineFeatureToMapLineData(IList lineFeatures, string name) + private MapLineData ConvertMultiLineFeatureToMapLineData(IEnumerable lineFeatures, string name) { - var mapFeatureList = new MapFeature[lineFeatures.Count]; + int lineFeaturesCount = lineFeatures.Count(); + var mapFeatureList = new MapFeature[lineFeaturesCount]; - for (var featureIndex = 0; featureIndex < lineFeatures.Count; featureIndex++) + for (var featureIndex = 0; featureIndex < lineFeaturesCount; featureIndex++) { - IFeature lineFeature = lineFeatures[featureIndex]; + IFeature lineFeature = lineFeatures.ElementAt(featureIndex); MapFeature feature = CreateMapFeatureForLineFeature(lineFeature); CopyMetaDataIntoFeature(feature, featureIndex); Index: Core/Components/src/Core.Components.Gis.IO/Writers/PolylineShapeFileWriter.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/src/Core.Components.Gis.IO/Writers/PolylineShapeFileWriter.cs (.../PolylineShapeFileWriter.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/src/Core.Components.Gis.IO/Writers/PolylineShapeFileWriter.cs (.../PolylineShapeFileWriter.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -65,7 +65,7 @@ IEnumerable mapGeometryPointCollection = geometry.PointCollections.First(); - IList coordinates = mapGeometryPointCollection.Select(p => new Coordinate(p.X, p.Y)).ToList(); + List coordinates = mapGeometryPointCollection.Select(p => new Coordinate(p.X, p.Y)).ToList(); return new LineString(coordinates); } Index: Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs =================================================================== diff -u -r9649e55312348f856051d40881b4e902b1a15a3b -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs (.../MultipleAreaSeries.cs) (revision 9649e55312348f856051d40881b4e902b1a15a3b) +++ Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs (.../MultipleAreaSeries.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -107,7 +107,7 @@ foreach (DataPoint[] area in Areas) { int n0 = area.Length; - IList pts0 = new ScreenPoint[n0]; + var pts0 = new ScreenPoint[n0]; TransformToScreenCoordinates(n0, pts0, area); renderContext.DrawClippedPolygon(clippingRect, pts0, 1, GetSelectableFillColor(Fill), Color, StrokeThickness); @@ -139,7 +139,7 @@ YAxis.Include(MaxY); } - private void TransformToScreenCoordinates(int n0, IList pts0, DataPoint[] actualPoints) + private void TransformToScreenCoordinates(int n0, ScreenPoint[] pts0, DataPoint[] actualPoints) { for (var i = 0; i < n0; i++) { Index: Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs =================================================================== diff -u -r9649e55312348f856051d40881b4e902b1a15a3b -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs (.../MultipleLineSeries.cs) (revision 9649e55312348f856051d40881b4e902b1a15a3b) +++ Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs (.../MultipleLineSeries.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -101,7 +101,7 @@ foreach (DataPoint[] line in Lines) { int n0 = line.Length; - IList pts0 = new ScreenPoint[n0]; + var pts0 = new ScreenPoint[n0]; TransformToScreenCoordinates(n0, pts0, line); renderContext.DrawLine(pts0, Color, StrokeThickness, Dashes ?? LineStyle.GetDashArray()); @@ -134,7 +134,7 @@ YAxis.Include(MaxY); } - private void TransformToScreenCoordinates(int n0, IList pts0, DataPoint[] actualPoints) + private void TransformToScreenCoordinates(int n0, ScreenPoint[] pts0, DataPoint[] actualPoints) { for (var i = 0; i < n0; i++) { Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs =================================================================== diff -u -r9d6009f11b5c63518c693e3d3be199ca9279015d -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs (.../StackChartControlTest.cs) (revision 9d6009f11b5c63518c693e3d3be199ca9279015d) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs (.../StackChartControlTest.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -294,25 +294,26 @@ } } - private static void AssertSeries(IList expectedSeriesTitles, CategoryPlotView plotView) + private static void AssertSeries(IEnumerable expectedSeriesTitles, CategoryPlotView plotView) { ElementCollection series = plotView.Model.Series; - Assert.AreEqual(expectedSeriesTitles.Count, series.Count); + Assert.AreEqual(expectedSeriesTitles.Count(), series.Count); - for (var i = 0; i < expectedSeriesTitles.Count; i++) + for (var i = 0; i < expectedSeriesTitles.Count(); i++) { - Assert.AreEqual(expectedSeriesTitles[i], series[i].Title); + Assert.AreEqual(expectedSeriesTitles.ElementAt(i), series[i].Title); } } - private static void AssertColumns(IList expectedColumnTitles, CategoryPlotView plotView) + private static void AssertColumns(IEnumerable expectedColumnTitles, CategoryPlotView plotView) { CategoryAxis axis = plotView.Model.Axes.OfType().First(); - Assert.AreEqual(expectedColumnTitles.Count, axis.Labels.Count); + int expectedColumnTitlesCount = expectedColumnTitles.Count(); + Assert.AreEqual(expectedColumnTitlesCount, axis.Labels.Count); - for (var i = 0; i < expectedColumnTitles.Count; i++) + for (var i = 0; i < expectedColumnTitlesCount; i++) { - Assert.AreEqual(expectedColumnTitles[i], axis.Labels[i]); + Assert.AreEqual(expectedColumnTitles.ElementAt(i), axis.Labels[i]); } } } Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r61c2ac2573d82151b0b1593260a419543d07122a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 61c2ac2573d82151b0b1593260a419543d07122a) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -197,109 +197,109 @@ const double targetProbability = 1.0 / 200000; ObservableList locations = failureMechanism.HydraulicBoundaryLocations; GeneralResult generalResult = null; - locations[0].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.19, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - locations[1].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.19, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - locations[2].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - locations[3].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196787, 4.78960, CalculationConvergence.CalculatedConverged, generalResult); - locations[4].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196787, 4.78960, CalculationConvergence.CalculatedConverged, generalResult); - locations[5].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations[6].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations[7].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations[8].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations[9].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations[10].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations[11].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations[12].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations[13].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.41, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations[14].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.41, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations[15].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 6.91, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - locations[16].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.53, targetProbability, 4.79014, 1.0 / 1195476, 4.78938, CalculationConvergence.CalculatedConverged, generalResult); - locations[17].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 7.80, targetProbability, 4.79014, 1.0 / 1194761, 4.78926, @@ -312,109 +312,109 @@ const double targetProbability = 1.0 / 200000; ObservableList locations = failureMechanism.HydraulicBoundaryLocations; GeneralResult generalResult = null; - locations[0].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.99, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations[1].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 5.04, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations[2].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.87, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations[3].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.73, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations[4].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.59, targetProbability, 4.79014, 1.0 / 1199833, 4.79011, CalculationConvergence.CalculatedConverged, generalResult); - locations[5].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.35, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - locations[6].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.83, targetProbability, 4.79014, 1.0 / 1196906, 4.78962, CalculationConvergence.CalculatedConverged, generalResult); - locations[7].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.00, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - locations[8].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.20, targetProbability, 4.79014, 1.0 / 1197324, 4.78969, CalculationConvergence.CalculatedConverged, generalResult); - locations[9].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.41, targetProbability, 4.79014, 1.0 / 1197324, 4.78969, CalculationConvergence.CalculatedConverged, generalResult); - locations[10].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.50, targetProbability, 4.79014, 1.0 / 1197622, 4.78974, CalculationConvergence.CalculatedConverged, generalResult); - locations[11].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.57, targetProbability, 4.79014, 1.0 / 1197145, 4.78966, CalculationConvergence.CalculatedConverged, generalResult); - locations[12].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.63, targetProbability, 4.79014, 1.0 / 1196608, 4.78957, CalculationConvergence.CalculatedConverged, generalResult); - locations[13].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.68, targetProbability, 4.79014, 1.0 / 1196549, 4.78956, CalculationConvergence.CalculatedConverged, generalResult); - locations[14].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.17, targetProbability, 4.79014, 1.0 / 1199713, 4.79009, CalculationConvergence.CalculatedConverged, generalResult); - locations[15].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 11.13, targetProbability, 4.79014, 1.0 / 201269, 4.79035, CalculationConvergence.CalculatedConverged, generalResult); - locations[16].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 9.24, targetProbability, 4.79014, 1.0 / 197742, 4.78976, CalculationConvergence.CalculatedConverged, generalResult); - locations[17].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 5.34, targetProbability, 4.79014, 1.0 / 199056, 4.78998, @@ -806,227 +806,227 @@ SetGrassCoverErosionOutwardsHydraulicBoundaryLocationWaveHeightOutputValues(demoAssessmentSection.GrassCoverErosionOutwards); } - private static void SetHydraulicBoundaryLocationDesignWaterLevelOutputValues(IList locations) + private static void SetHydraulicBoundaryLocationDesignWaterLevelOutputValues(IEnumerable locations) { const double targetProbability = 1.0 / 30000; GeneralResult generalResult = null; - locations[0].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.78, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations[1].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.77, targetProbability, 3.98787893, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations[2].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.77, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations[3].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.77, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations[4].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.76865, targetProbability, 3.98788, 1.0 / 29996, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[5].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[6].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[7].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[8].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[9].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[10].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[11].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[12].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[13].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[14].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations[15].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.54, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations[16].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 5.86, targetProbability, 3.98788, 1.0 / 29994, 3.98783, CalculationConvergence.CalculatedConverged, generalResult); - locations[17].DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( 6.00, targetProbability, 3.98788, 1.0 / 29993, 3.98782, CalculationConvergence.CalculatedConverged, generalResult); } - private static void SetHydraulicBoundaryLocationWaveHeightOutputValues(IList locations) + private static void SetHydraulicBoundaryLocationWaveHeightOutputValues(IEnumerable locations) { const double targetProbability = 1.0 / 30000; GeneralResult generalResult = null; - locations[0].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.13, targetProbability, 3.98788, 1.0 / 29972, 3.98766, CalculationConvergence.CalculatedConverged, generalResult); - locations[1].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.19, targetProbability, 3.98788, 1.0 / 29962, 3.98770, CalculationConvergence.CalculatedConverged, generalResult); - locations[2].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.02, targetProbability, 3.98788, 1.0 / 29977, 3.98758, CalculationConvergence.CalculatedConverged, generalResult); - locations[3].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.87, targetProbability, 3.98788, 1.0 / 29963, 3.98759, CalculationConvergence.CalculatedConverged, generalResult); - locations[4].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.73, targetProbability, 3.98788, 1.0 / 29957, 3.98754, CalculationConvergence.CalculatedConverged, generalResult); - locations[5].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 2.65, targetProbability, 3.98788, 1.0 / 30022, 3.98805, CalculationConvergence.CalculatedConverged, generalResult); - locations[6].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.04, targetProbability, 3.98788, 1.0 / 30001, 3.98789, CalculationConvergence.CalculatedConverged, generalResult); - locations[7].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.20, targetProbability, 3.98788, 1.0 / 30000, 3.98788, CalculationConvergence.CalculatedConverged, generalResult); - locations[8].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.35, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations[9].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.53, targetProbability, 3.98788, 1.0 / 29999, 3.98787, CalculationConvergence.CalculatedConverged, generalResult); - locations[10].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.62, targetProbability, 3.98788, 1.0 / 29888, 3.98699, CalculationConvergence.CalculatedConverged, generalResult); - locations[11].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.68, targetProbability, 3.98788, 1.0 / 29890, 3.98701, CalculationConvergence.CalculatedConverged, generalResult); - locations[12].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.73, targetProbability, 3.98788, 1.0 / 29882, 3.98694, CalculationConvergence.CalculatedConverged, generalResult); - locations[13].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.75, targetProbability, 3.98788, 1.0 / 29902, 3.98710, CalculationConvergence.CalculatedConverged, generalResult); - locations[14].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 3.30, targetProbability, 3.98788, 1.0 / 30037, 3.98817, CalculationConvergence.CalculatedConverged, generalResult); - locations[15].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 9.57, targetProbability, 3.98788, 1.0 / 29999, 3.98787, CalculationConvergence.CalculatedConverged, generalResult); - locations[16].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 8.02, targetProbability, 3.98788, 1.0 / 30108, 3.98873, CalculationConvergence.CalculatedConverged, generalResult); - locations[17].WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( 4.11, targetProbability, 3.98788, 1.0 / 29929, 3.98732, Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -368,7 +368,7 @@ }; } - private static IList GetInputs(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -379,7 +379,7 @@ }; } - private static IList GetOutputs(ClosingStructuresFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(ClosingStructuresFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/SelectionDialogBase.cs =================================================================== diff -u -rb6d6acf62adcb4b23c4c5f6724fbd0091585bbb3 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Common/src/Ringtoets.Common.Forms/SelectionDialogBase.cs (.../SelectionDialogBase.cs) (revision b6d6acf62adcb4b23c4c5f6724fbd0091585bbb3) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/SelectionDialogBase.cs (.../SelectionDialogBase.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -62,7 +62,7 @@ /// /// Sets the datasource on the . /// - protected void SetDataSource(IList data) + protected void SetDataSource(IEnumerable data) { DataGridViewControl.SetDataSource(data); } Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs =================================================================== diff -u -r61c2ac2573d82151b0b1593260a419543d07122a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision 61c2ac2573d82151b0b1593260a419543d07122a) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -319,9 +319,9 @@ return Math2D.ConvertLinePointsToLineSegments(linePoints); } - private static IEnumerable CreateFailureMechanismSectionsSnappedOnReferenceLine(IEnumerable orderedReadSections, IList splitResults) + private static IEnumerable CreateFailureMechanismSectionsSnappedOnReferenceLine(IEnumerable orderedReadSections, IEnumerable splitResults) { - return orderedReadSections.Select((t, i) => new FailureMechanismSection(t.Name, splitResults[i])).ToList(); + return orderedReadSections.Select((t, i) => new FailureMechanismSection(t.Name, splitResults.ElementAt(i))).ToList(); } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/CharacteristicPointsCsvReader.cs =================================================================== diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision 01bd90d4fab9699280c5619754fc55b4f03be08a) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -447,9 +447,9 @@ /// The tokenized string from which the name should be extracted. /// The name of the location. /// Thrown when id value is null or empty. - private string GetLocationName(IList tokenizedString) + private string GetLocationName(IEnumerable tokenizedString) { - string name = tokenizedString.Any() ? tokenizedString[columnsInFile[locationIdKey]].Trim() : null; + string name = tokenizedString.Any() ? tokenizedString.ElementAt(columnsInFile[locationIdKey]).Trim() : null; if (string.IsNullOrEmpty(name)) { throw CreateLineParseException(lineNumber, Resources.CharacteristicPointsCsvReader_ReadLine_Line_lacks_ID); Index: Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLinesCsvReader.cs =================================================================== diff -u -r25772ddfd0a02f2fb7633bf69d114106900f5bb0 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLinesCsvReader.cs (.../SurfaceLinesCsvReader.cs) (revision 25772ddfd0a02f2fb7633bf69d114106900f5bb0) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLinesCsvReader.cs (.../SurfaceLinesCsvReader.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -269,9 +269,9 @@ /// The tokenized string from which the name should be extracted. /// The name of the surface line. /// Thrown when id value is null or empty. - private string GetSurfaceLineName(IList tokenizedString) + private string GetSurfaceLineName(IEnumerable tokenizedString) { - string name = tokenizedString.Any() ? tokenizedString[idNameColumnIndex].Trim() : string.Empty; + string name = tokenizedString.Any() ? tokenizedString.ElementAt(idNameColumnIndex).Trim() : string.Empty; if (string.IsNullOrEmpty(name)) { throw CreateLineParseException(lineNumber, Resources.SurfaceLinesCsvReader_ReadLine_Line_lacks_ID); Index: Ringtoets/Common/src/Ringtoets.Common.Utils/AssignUnassignCalculations.cs =================================================================== diff -u -r964f8948f0ec59095ea9cc58fdabd706c4b17d22 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Common/src/Ringtoets.Common.Utils/AssignUnassignCalculations.cs (.../AssignUnassignCalculations.cs) (revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22) +++ Ringtoets/Common/src/Ringtoets.Common.Utils/AssignUnassignCalculations.cs (.../AssignUnassignCalculations.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -136,13 +136,13 @@ } if (calculationsPerSegmentName.ContainsKey(sectionName)) { - IList calculationsInCurrentSection = calculationsPerSegmentName[sectionName]; + IEnumerable calculationsInCurrentSection = calculationsPerSegmentName[sectionName]; if (!calculationsInCurrentSection.Contains(sectionResult.Calculation)) { sectionResult.Calculation = null; affected = true; } - if (sectionResult.Calculation == null && calculationsInCurrentSection.Count == 1) + if (sectionResult.Calculation == null && calculationsInCurrentSection.Count() == 1) { sectionResult.Calculation = calculationsInCurrentSection.Single(); affected = true; Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -172,7 +172,7 @@ }; } - private static IList GetInputs(DuneErosionFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(DuneErosionFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -181,7 +181,7 @@ }; } - private static IList GetOutputs(DuneErosionFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(DuneErosionFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -539,7 +539,7 @@ }; } - private static IList GetInputs(GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -549,7 +549,7 @@ }; } - private static IList GetOutputs(GrassCoverErosionInwardsFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(GrassCoverErosionInwardsFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -427,7 +427,7 @@ }; } - private static IList GetInputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -437,7 +437,7 @@ }; } - private static IList GetOutputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -381,7 +381,7 @@ }; } - private static IList GetInputs(HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -392,7 +392,7 @@ }; } - private static IList GetOutputs(HeightStructuresFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(HeightStructuresFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r6d67c92bda51062e3052d003885638a5b30c8575 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 6d67c92bda51062e3052d003885638a5b30c8575) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -1194,7 +1194,7 @@ }; } - private static IList GetInputs(IFailureMechanism nodeData, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(IFailureMechanism nodeData, IAssessmentSection assessmentSection) { return new ArrayList { @@ -1203,7 +1203,7 @@ }; } - private static IList GetOutputs(IFailureMechanism nodeData) + private static IEnumerable GetOutputs(IFailureMechanism nodeData) { var duneErosion = nodeData as IHasSectionResults; var grassCoverSlipOffInwards = nodeData as IHasSectionResults; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r89a30d666e2e684db9d72ed16c3be18a6afad391 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -686,7 +686,7 @@ }; } - private static IList GetInputs(MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -697,7 +697,7 @@ }; } - private static IList GetOutputs(MacroStabilityInwardsFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(MacroStabilityInwardsFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs =================================================================== diff -u -rb2b200315a083c291be715da833f87b0247a4050 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision b2b200315a083c291be715da833f87b0247a4050) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -211,17 +211,17 @@ } // Update the areas of all soil layer chart data - IList soilLayers = GetSoilLayers(); + IEnumerable soilLayers = GetSoilLayers(); - for (var i = 0; i < soilLayers.Count; i++) + for (var i = 0; i < soilLayers.Count(); i++) { ChartMultipleAreaData soilLayerData = soilLayerChartDataLookup[i]; - soilLayerData.Areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayers[i], currentSoilProfile, data.InputParameters.SurfaceLine); + soilLayerData.Areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayers.ElementAt(i), currentSoilProfile, data.InputParameters.SurfaceLine); } } - private IList GetSoilLayers() + private IEnumerable GetSoilLayers() { return data?.InputParameters.StochasticSoilProfile?.SoilProfile.Layers.ToList() ?? new List(); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r8b567830c978aa32ef7fbe0a16d71f637ff383e3 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 8b567830c978aa32ef7fbe0a16d71f637ff383e3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -680,7 +680,7 @@ }; } - private static IList GetInputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -691,7 +691,7 @@ }; } - private static IList GetOutputs(PipingFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(PipingFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -813,54 +813,54 @@ Assert.AreEqual("Uittredepunt", exitPointChartData.Name); } - private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IList characteristicPoints) + private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IEnumerable characteristicPoints) { Point3D first = surfaceLine.Points.First(); Point3D last = surfaceLine.Points.Last(); var firstPoint = new Point2D(first.X, first.Y); var lastPoint = new Point2D(last.X, last.Y); - var ditchDikeSideData = (ChartPointData) characteristicPoints[ditchDikeSideIndex]; + var ditchDikeSideData = (ChartPointData) characteristicPoints.ElementAt(ditchDikeSideIndex); Assert.AreEqual(1, ditchDikeSideData.Points.Length); CollectionAssert.AreEqual(new[] { surfaceLine.DitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, ditchDikeSideData.Points); Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name); - var bottomDitchDikeSideData = (ChartPointData) characteristicPoints[bottomDitchDikeSideIndex]; + var bottomDitchDikeSideData = (ChartPointData) characteristicPoints.ElementAt(bottomDitchDikeSideIndex); Assert.AreEqual(1, bottomDitchDikeSideData.Points.Length); CollectionAssert.AreEqual(new[] { surfaceLine.BottomDitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, bottomDitchDikeSideData.Points); Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name); - var ditchPolderSideData = (ChartPointData) characteristicPoints[ditchPolderSideIndex]; + var ditchPolderSideData = (ChartPointData) characteristicPoints.ElementAt(ditchPolderSideIndex); Assert.AreEqual(1, ditchPolderSideData.Points.Length); CollectionAssert.AreEqual(new[] { surfaceLine.DitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, ditchPolderSideData.Points); Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name); - var bottomDitchPolderSideData = (ChartPointData) characteristicPoints[bottomDitchPolderSideIndex]; + var bottomDitchPolderSideData = (ChartPointData) characteristicPoints.ElementAt(bottomDitchPolderSideIndex); Assert.AreEqual(1, bottomDitchPolderSideData.Points.Length); CollectionAssert.AreEqual(new[] { surfaceLine.BottomDitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, bottomDitchPolderSideData.Points); Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name); - var dikeToeAtPolderData = (ChartPointData) characteristicPoints[dikeToeAtPolderIndex]; + var dikeToeAtPolderData = (ChartPointData) characteristicPoints.ElementAt(dikeToeAtPolderIndex); Assert.AreEqual(1, dikeToeAtPolderData.Points.Length); CollectionAssert.AreEqual(new[] { surfaceLine.DikeToeAtPolder.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, dikeToeAtPolderData.Points); Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name); - var dikeToeAtRiverData = (ChartPointData) characteristicPoints[dikeToeAtRiverIndex]; + var dikeToeAtRiverData = (ChartPointData) characteristicPoints.ElementAt(dikeToeAtRiverIndex); Assert.AreEqual(1, dikeToeAtRiverData.Points.Length); CollectionAssert.AreEqual(new[] { Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs =================================================================== diff -u -r8b567830c978aa32ef7fbe0a16d71f637ff383e3 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs (.../PipingCalculationConfigurationReaderTest.cs) (revision 8b567830c978aa32ef7fbe0a16d71f637ff383e3) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs (.../PipingCalculationConfigurationReaderTest.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -297,7 +297,7 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - IList readConfigurationItems = reader.Read().ToList(); + List readConfigurationItems = reader.Read().ToList(); // Assert Assert.AreEqual(1, readConfigurationItems.Count); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs =================================================================== diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -971,15 +971,17 @@ AssertWaterLevelGeometries(expectedLines, lines); } - private static void AssertWaterLevelGeometries(IList expectedLines, IList lines) + private static void AssertWaterLevelGeometries(IEnumerable expectedLines, IList lines) { - Assert.AreEqual(expectedLines.Count, lines.Count); - for (var i = 0; i < expectedLines.Count; i++) + int expectedLinesCount = expectedLines.Count(); + Assert.AreEqual(expectedLinesCount, lines.Count); + for (var i = 0; i < expectedLinesCount; i++) { - Assert.AreEqual(expectedLines[i].Length, lines[i].Length); - for (var j = 0; j < expectedLines[i].Length; j++) + Point2D[] expectedLineGeometry = expectedLines.ElementAt(i); + Assert.AreEqual(expectedLineGeometry.Length, lines[i].Length); + for (var j = 0; j < expectedLineGeometry.Length; j++) { - Point2D expectedPoint = expectedLines[i][j]; + Point2D expectedPoint = expectedLineGeometry[j]; Point2D actualPoint = lines[i][j]; Assert.AreEqual(expectedPoint.X, actualPoint.X, 1e-6); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -387,8 +387,8 @@ }; } - private static IList GetInputs(StabilityPointStructuresFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(StabilityPointStructuresFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) { return new ArrayList { @@ -399,7 +399,7 @@ }; } - private static IList GetOutputs(StabilityPointStructuresFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(StabilityPointStructuresFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -262,7 +262,7 @@ }; } - private static IList GetInputs(StabilityStoneCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(StabilityStoneCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -272,7 +272,7 @@ }; } - private static IList GetOutputs(StabilityStoneCoverFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(StabilityStoneCoverFailureMechanism failureMechanism) { return new ArrayList { Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) @@ -264,7 +264,7 @@ }; } - private static IList GetInputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new ArrayList { @@ -274,7 +274,7 @@ }; } - private static IList GetOutputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism) { return new ArrayList {