Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 4000) @@ -19,10 +19,16 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using Deltares.DamEngine.Data.General; +using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.General.TimeSeries; +using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Io.XmlOutput; +using DesignResult = Deltares.DamEngine.Io.XmlOutput.DesignResult; using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerie; +using UpliftSituation = Deltares.DamEngine.Data.General.UpliftSituation; namespace Deltares.DamEngine.Interface { @@ -39,14 +45,14 @@ public static Output CreateOutput(DamProjectData damProjectData) { // Echo of the input - Output output = new Output + var output = new Output { ValidationResults = new Message[0], // Results Results = new OutputResults { // Calculation messages - CalculationMessages = new Message[damProjectData.CalculationMessages.Count], + CalculationMessages = new Message[damProjectData.CalculationMessages.Count], } }; CreateCalculationMessages(damProjectData, output); @@ -58,12 +64,12 @@ private static void CreateDesignResultsOutput(DamProjectData damProjectData, Output output) { // Design results - var designResults = damProjectData.DesignCalculations; + List designResults = damProjectData.DesignCalculations; if (designResults != null && designResults.Count > 0) { output.Results.CalculationResults = new DesignResult[designResults.Count]; var designResultCount = 0; - foreach (var designResult in designResults) + foreach (Data.General.Results.DesignResult designResult in designResults) { var desResult = new DesignResult { @@ -75,15 +81,16 @@ CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(designResult.CalculationResult), }; - if (designResult.PipingDesignResults != null) { CreateDesignResultsPipingOutput(desResult, designResult); } + if (designResult.StabilityDesignResults != null) { CreateDesignResultsStabilityOutput(desResult, designResult); } + output.Results.CalculationResults[designResultCount] = desResult; designResultCount++; } @@ -92,15 +99,15 @@ private static void CreateCalculationMessages(DamProjectData damProjectData, Output output) { - var calculationMessages = damProjectData.CalculationMessages; + List calculationMessages = damProjectData.CalculationMessages; if (calculationMessages != null) { output.Results.CalculationMessages = new Message[calculationMessages.Count]; - for (int i = 0; i < calculationMessages.Count; i++) + for (var i = 0; i < calculationMessages.Count; i++) { var message = new Message { - MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType) + MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType) }; if (calculationMessages[i].Subject != null) { @@ -110,6 +117,7 @@ { message.Message1 = calculationMessages[i].Message; } + output.Results.CalculationMessages[i] = message; } } @@ -128,10 +136,10 @@ Name = designResult.PipingDesignResults.RedesignedSurfaceLine.Name, Points = new SurfaceLinePoint[designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count] }; - for (int j = 0; j < designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count; j++) + for (var j = 0; j < designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count; j++) { - var characteristicPoint = designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints[j]; - var inputPoint = new SurfaceLinePoint() + CharacteristicPoint characteristicPoint = designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints[j]; + var inputPoint = new SurfaceLinePoint { PointType = ConversionHelper.ConvertToInputPointType(characteristicPoint.CharacteristicPointType), X = characteristicPoint.X, @@ -142,77 +150,146 @@ } desResult.PipingDesignResults.UpliftFactorSpecified = designResult.PipingDesignResults.UpliftFactor.HasValue; - if (designResult.PipingDesignResults.UpliftFactor.HasValue) desResult.PipingDesignResults.UpliftFactor = designResult.PipingDesignResults.UpliftFactor.Value; + if (designResult.PipingDesignResults.UpliftFactor.HasValue) + { + desResult.PipingDesignResults.UpliftFactor = designResult.PipingDesignResults.UpliftFactor.Value; + } desResult.PipingDesignResults.HeaveFactorSpecified = designResult.PipingDesignResults.HeaveFactor.HasValue; - if (designResult.PipingDesignResults.HeaveFactor.HasValue) desResult.PipingDesignResults.HeaveFactor = designResult.PipingDesignResults.HeaveFactor.Value; + if (designResult.PipingDesignResults.HeaveFactor.HasValue) + { + desResult.PipingDesignResults.HeaveFactor = designResult.PipingDesignResults.HeaveFactor.Value; + } desResult.PipingDesignResults.BlighFactorSpecified = designResult.PipingDesignResults.BlighFactor.HasValue; - if (designResult.PipingDesignResults.BlighFactor.HasValue) desResult.PipingDesignResults.BlighFactor = designResult.PipingDesignResults.BlighFactor.Value; + if (designResult.PipingDesignResults.BlighFactor.HasValue) + { + desResult.PipingDesignResults.BlighFactor = designResult.PipingDesignResults.BlighFactor.Value; + } desResult.PipingDesignResults.BlighHcriticalSpecified = designResult.PipingDesignResults.BlighHcritical.HasValue; - if (designResult.PipingDesignResults.BlighHcritical.HasValue) desResult.PipingDesignResults.BlighHcritical = designResult.PipingDesignResults.BlighHcritical.Value; + if (designResult.PipingDesignResults.BlighHcritical.HasValue) + { + desResult.PipingDesignResults.BlighHcritical = designResult.PipingDesignResults.BlighHcritical.Value; + } desResult.PipingDesignResults.Sellmeijer4ForcesFactorSpecified = designResult.PipingDesignResults.Sellmeijer4ForcesFactor.HasValue; - if (designResult.PipingDesignResults.Sellmeijer4ForcesFactor.HasValue) desResult.PipingDesignResults.Sellmeijer4ForcesFactor = designResult.PipingDesignResults.Sellmeijer4ForcesFactor.Value; + if (designResult.PipingDesignResults.Sellmeijer4ForcesFactor.HasValue) + { + desResult.PipingDesignResults.Sellmeijer4ForcesFactor = designResult.PipingDesignResults.Sellmeijer4ForcesFactor.Value; + } desResult.PipingDesignResults.Sellmeijer4ForcesHcriticalSpecified = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical.HasValue; - if (designResult.PipingDesignResults.Sellmeijer4ForcesHcritical.HasValue) desResult.PipingDesignResults.Sellmeijer4ForcesHcritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical.Value; + if (designResult.PipingDesignResults.Sellmeijer4ForcesHcritical.HasValue) + { + desResult.PipingDesignResults.Sellmeijer4ForcesHcritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical.Value; + } desResult.PipingDesignResults.SellmeijerVnkFactorSpecified = designResult.PipingDesignResults.SellmeijerVnkFactor.HasValue; - if (designResult.PipingDesignResults.SellmeijerVnkFactor.HasValue) desResult.PipingDesignResults.SellmeijerVnkFactor = designResult.PipingDesignResults.SellmeijerVnkFactor.Value; + if (designResult.PipingDesignResults.SellmeijerVnkFactor.HasValue) + { + desResult.PipingDesignResults.SellmeijerVnkFactor = designResult.PipingDesignResults.SellmeijerVnkFactor.Value; + } desResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified = designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue; - if (designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue) desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical.Value; + if (designResult.PipingDesignResults.SellmeijerVnkHcritical.HasValue) + { + desResult.PipingDesignResults.SellmeijerVnkHcritical = designResult.PipingDesignResults.SellmeijerVnkHcritical.Value; + } desResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue; - if (designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionFactor = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.Value; + if (designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.HasValue) + { + desResult.PipingDesignResults.Wti2017BackwardErosionFactor = designResult.PipingDesignResults.Wti2017BackwardErosionSafetyFactor.Value; + } desResult.PipingDesignResults.Wti2017BackwardErosionHcriticalSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue; - if (designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.Value; + if (designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.HasValue) + { + desResult.PipingDesignResults.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical.Value; + } desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiCSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue; - if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.Value; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.HasValue) + { + desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC.Value; + } desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReducedSpecified = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue; - if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue) desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.Value; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.HasValue) + { + desResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced.Value; + } desResult.PipingDesignResults.Wti2017UpliftFactorSpecified = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue; - if (designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue) desResult.PipingDesignResults.Wti2017UpliftFactor = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.Value; + if (designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.HasValue) + { + desResult.PipingDesignResults.Wti2017UpliftFactor = designResult.PipingDesignResults.Wti2017UpliftSafetyFactor.Value; + } desResult.PipingDesignResults.Wti2017UpliftHcriticalSpecified = designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue; - if (designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue) desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical.Value; + if (designResult.PipingDesignResults.Wti2017UpliftHcritical.HasValue) + { + desResult.PipingDesignResults.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical.Value; + } desResult.PipingDesignResults.Wti2017DeltaPhiCuSpecified = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue; - if (designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue) desResult.PipingDesignResults.Wti2017DeltaPhiCu = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.Value; + if (designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.HasValue) + { + desResult.PipingDesignResults.Wti2017DeltaPhiCu = designResult.PipingDesignResults.Wti2017UpliftDeltaPhiC.Value; + } desResult.PipingDesignResults.Wti2017HeaveFactorSpecified = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue; - if (designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue) desResult.PipingDesignResults.Wti2017HeaveFactor = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.Value; + if (designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.HasValue) + { + desResult.PipingDesignResults.Wti2017HeaveFactor = designResult.PipingDesignResults.Wti2017HeaveSafetyFactor.Value; + } desResult.PipingDesignResults.Wti2017HeaveHcriticalSpecified = designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue; - if (designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue) desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical.Value; + if (designResult.PipingDesignResults.Wti2017HeaveHcritical.HasValue) + { + desResult.PipingDesignResults.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical.Value; + } desResult.PipingDesignResults.Wti2017GradientSpecified = designResult.PipingDesignResults.Wti2017Gradient.HasValue; - if (designResult.PipingDesignResults.Wti2017Gradient.HasValue) desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient.Value; + if (designResult.PipingDesignResults.Wti2017Gradient.HasValue) + { + desResult.PipingDesignResults.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient.Value; + } desResult.PipingDesignResults.Wti2017FactorOverallSpecified = designResult.PipingDesignResults.Wti2017SafetyFactorOverall.HasValue; - if (designResult.PipingDesignResults.Wti2017SafetyFactorOverall.HasValue) desResult.PipingDesignResults.Wti2017FactorOverall = designResult.PipingDesignResults.Wti2017SafetyFactorOverall.Value; + if (designResult.PipingDesignResults.Wti2017SafetyFactorOverall.HasValue) + { + desResult.PipingDesignResults.Wti2017FactorOverall = designResult.PipingDesignResults.Wti2017SafetyFactorOverall.Value; + } desResult.PipingDesignResults.Wti2017HcriticalOverallSpecified = designResult.PipingDesignResults.Wti2017HcriticalOverall.HasValue; - if (designResult.PipingDesignResults.Wti2017HcriticalOverall.HasValue) desResult.PipingDesignResults.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall.Value; + if (designResult.PipingDesignResults.Wti2017HcriticalOverall.HasValue) + { + desResult.PipingDesignResults.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall.Value; + } desResult.PipingDesignResults.ExitPointXSpecified = designResult.PipingDesignResults.LocalExitPointX.HasValue; - if (designResult.PipingDesignResults.LocalExitPointX.HasValue) desResult.PipingDesignResults.ExitPointX = designResult.PipingDesignResults.LocalExitPointX.Value; + if (designResult.PipingDesignResults.LocalExitPointX.HasValue) + { + desResult.PipingDesignResults.ExitPointX = designResult.PipingDesignResults.LocalExitPointX.Value; + } desResult.PipingDesignResults.Wti2017EffectiveStressSpecified = designResult.PipingDesignResults.EffectiveStress.HasValue; - if (designResult.PipingDesignResults.EffectiveStress.HasValue) desResult.PipingDesignResults.Wti2017EffectiveStress = designResult.PipingDesignResults.EffectiveStress.Value; + if (designResult.PipingDesignResults.EffectiveStress.HasValue) + { + desResult.PipingDesignResults.Wti2017EffectiveStress = designResult.PipingDesignResults.EffectiveStress.Value; + } desResult.PipingDesignResults.Wti2017CCreepSpecified = designResult.PipingDesignResults.CCreep.HasValue; - if (designResult.PipingDesignResults.CCreep.HasValue) desResult.PipingDesignResults.Wti2017CCreep = designResult.PipingDesignResults.CCreep.Value; + if (designResult.PipingDesignResults.CCreep.HasValue) + { + desResult.PipingDesignResults.Wti2017CCreep = designResult.PipingDesignResults.CCreep.Value; + } if (designResult.PipingDesignResults.UpliftSituation.HasValue) { - var uplift = designResult.PipingDesignResults.UpliftSituation.Value; + UpliftSituation uplift = designResult.PipingDesignResults.UpliftSituation.Value; desResult.PipingDesignResults.UpliftSituation = new Io.XmlOutput.UpliftSituation { IsUplift = uplift.IsUplift, @@ -226,17 +303,16 @@ } } - private static void CreateDesignResultsStabilityOutput(DesignResult desResult, Data.General.Results.DesignResult designResult) { - desResult.StabilityDesignResults = new DesignResultStabilityDesignResults() + desResult.StabilityDesignResults = new DesignResultStabilityDesignResults { ResultMessage = designResult.StabilityDesignResults.ResultMessage }; if (designResult.StabilityDesignResults.UpliftSituation.HasValue) { - var uplift = designResult.StabilityDesignResults.UpliftSituation.Value; + UpliftSituation uplift = designResult.StabilityDesignResults.UpliftSituation.Value; desResult.StabilityDesignResults.UpliftSituation = new Io.XmlOutput.UpliftSituation { IsUplift = uplift.IsUplift, @@ -256,10 +332,10 @@ Name = designResult.StabilityDesignResults.RedesignedSurfaceLine.Name, Points = new SurfaceLinePoint[designResult.StabilityDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count] }; - for (int j = 0; j < designResult.StabilityDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count; j++) + for (var j = 0; j < designResult.StabilityDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count; j++) { - var characteristicPoint = designResult.StabilityDesignResults.RedesignedSurfaceLine.CharacteristicPoints[j]; - var inputPoint = new SurfaceLinePoint() + CharacteristicPoint characteristicPoint = designResult.StabilityDesignResults.RedesignedSurfaceLine.CharacteristicPoints[j]; + var inputPoint = new SurfaceLinePoint { PointType = ConversionHelper.ConvertToInputPointType(characteristicPoint.CharacteristicPointType), X = characteristicPoint.X, @@ -271,7 +347,7 @@ if (designResult.StabilityDesignResults != null) { - switch(designResult.StabilityDesignResults.StabilityModelType) + switch (designResult.StabilityDesignResults.StabilityModelType) { case MStabModelType.Bishop: desResult.StabilityDesignResults.SlipCircleDefinition = new SlidingCircleMinimumSafetyCurveType(); @@ -299,7 +375,7 @@ X = designResult.StabilityDesignResults.ActiveCenterPoint.X, Z = designResult.StabilityDesignResults.ActiveCenterPoint.Z }; - dualSlipCircleDefinition.ActiveCircleRadius = designResult.StabilityDesignResults.ActiveCenterPointRadius; + dualSlipCircleDefinition.ActiveCircleRadius = designResult.StabilityDesignResults.ActiveCenterPointRadius; } if (designResult.StabilityDesignResults.PassiveCenterPoint != null) @@ -311,8 +387,10 @@ }; dualSlipCircleDefinition.PassiveCircleRadius = designResult.StabilityDesignResults.PassiveCenterPointRadius; } + break; } + if (designResult.StabilityDesignResults.StabilityModelType == MStabModelType.Bishop || designResult.StabilityDesignResults.StabilityModelType == MStabModelType.UpliftVan) { @@ -322,17 +400,30 @@ desResult.StabilityDesignResults.SlipCircleDefinition.Slices = new MinimumSafetyCurveBaseTypeSlice[designResult.StabilityDesignResults.ResultSlices.Count]; var index = 0; - foreach (var slice in designResult.StabilityDesignResults.ResultSlices) + foreach (StabilityResultSlice slice in designResult.StabilityDesignResults.ResultSlices) { var resultSlice = new MinimumSafetyCurveBaseTypeSlice { - TopLeftPoint = new Point2DType {X = slice.TopLeftPoint.X, Z = slice.TopLeftPoint.Z}, - TopRightPoint = new Point2DType {X = slice.TopRightPoint.X, Z = slice.TopRightPoint.Z}, + TopLeftPoint = new Point2DType + { + X = slice.TopLeftPoint.X, + Z = slice.TopLeftPoint.Z + }, + TopRightPoint = new Point2DType + { + X = slice.TopRightPoint.X, + Z = slice.TopRightPoint.Z + }, BottomLeftPoint = - new Point2DType {X = slice.BottomLeftPoint.X, Z = slice.BottomLeftPoint.Z}, + new Point2DType + { + X = slice.BottomLeftPoint.X, + Z = slice.BottomLeftPoint.Z + }, BottomRightPoint = new Point2DType { - X = slice.BottomRightPoint.X, Z = slice.BottomRightPoint.Z + X = slice.BottomRightPoint.X, + Z = slice.BottomRightPoint.Z } }; desResult.StabilityDesignResults.SlipCircleDefinition.Slices[index] = resultSlice; @@ -342,12 +433,17 @@ } } - desResult.StabilityDesignResults.SafetyFactorSpecified = designResult.StabilityDesignResults.SafetyFactor.HasValue; - if (designResult.StabilityDesignResults.SafetyFactor.HasValue) desResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.SafetyFactor.Value; + if (designResult.StabilityDesignResults.SafetyFactor.HasValue) + { + desResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.SafetyFactor.Value; + } desResult.StabilityDesignResults.NumberOfIterationsSpecified = designResult.StabilityDesignResults.NumberOfIterations.HasValue; - if (designResult.StabilityDesignResults.NumberOfIterations.HasValue) desResult.StabilityDesignResults.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations.Value; + if (designResult.StabilityDesignResults.NumberOfIterations.HasValue) + { + desResult.StabilityDesignResults.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations.Value; + } desResult.StabilityDesignResults.StabilityModelTypeSpecified = designResult.StabilityDesignResults.StabilityModelType.HasValue; if (designResult.StabilityDesignResults.StabilityModelType.HasValue) @@ -369,10 +465,10 @@ private static void TransferOutputTimeSeries(TimeSerieCollection outputTimeSerieCollection, TimeSerie[] outputTimeSeries) { - int timeSerieIndex = 0; - foreach (var damTimeSerie in outputTimeSerieCollection.Series) + var timeSerieIndex = 0; + foreach (Data.General.TimeSeries.TimeSerie damTimeSerie in outputTimeSerieCollection.Series) { - TimeSerie outputTimeSerie = new TimeSerie(); + var outputTimeSerie = new TimeSerie(); outputTimeSerie.Entries = new TimeSerieEntries(); outputTimeSerie.Entries.TimeSerieEntry = new TimeSerieEntriesTimeSerieEntry[damTimeSerie.Entries.Count]; outputTimeSerie.TimeStep = new TimeSerieTimeStep(); @@ -395,20 +491,21 @@ outputTimeSerie.TimeStep.MultiplierSpecified1 = damTimeSerie.TimeStep.MultiplierSpecified; outputTimeSerie.TimeStep.DividerSpecified1 = damTimeSerie.TimeStep.DividerSpecified; outputTimeSerie.TimeStep.TimeStepUnit = ConversionHelper.ConvertToInputTimeStepUnit(damTimeSerie.TimeStep.Unit); - int timeSerieEntryIndex = 0; - foreach (var timestepEntry in damTimeSerie.Entries) + var timeSerieEntryIndex = 0; + foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries) { TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null; if (timestepEntry.StochastValue != null) { - stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue() + stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue { Distribution = timestepEntry.StochastValue.Distribution, Mean = timestepEntry.StochastValue.Mean, StandardDeviation = timestepEntry.StochastValue.StandardDeviation }; } - TimeSerieEntriesTimeSerieEntry timeStep = new TimeSerieEntriesTimeSerieEntry() + + var timeStep = new TimeSerieEntriesTimeSerieEntry { DateTime = timestepEntry.DateTime, Value = timestepEntry.Value, @@ -420,9 +517,10 @@ outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep; timeSerieEntryIndex++; } + outputTimeSeries[timeSerieIndex] = outputTimeSerie; timeSerieIndex++; } } } -} +} \ No newline at end of file