Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs =================================================================== diff -u -r1465 -r1466 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 1465) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 1466) @@ -59,8 +59,8 @@ { damProjectData.CalculationMessages.Clear(); } - var total = DetermineMainNumberOfCalculations(damProjectData.Dike.Locations); - var current = 0; + var totalCalculationSteps = DetermineTotalCalculationSteps(damProjectData.Dike.Locations); + var currentStep = 0; for (int locationIndex = 0; locationIndex < damProjectData.Dike.Locations.Count; locationIndex++) { var location = damProjectData.Dike.Locations[locationIndex]; @@ -79,8 +79,8 @@ damProjectData.CalculationMessages.AddRange(calculationMessages); damProjectData.DesignCalculations.AddRange(designResults); } - current++; - progressDelegate?.Invoke(Convert.ToDouble(current) / Convert.ToDouble(total)); + currentStep++; + progressDelegate?.Invoke(Convert.ToDouble(currentStep) / Convert.ToDouble(totalCalculationSteps)); } } } @@ -323,17 +323,14 @@ return CalculationResult.Succeeded; } - private int DetermineMainNumberOfCalculations(IList locations) + private int DetermineTotalCalculationSteps(IList locations) { - var total = 0; + var totalCalculationSteps = 0; foreach (var location in locations) { - for (int subSoilScenarioIndex = 0; subSoilScenarioIndex < location.Segment.SoilProfileProbabilities.Count; subSoilScenarioIndex++) - { - total++; - } + totalCalculationSteps += location.Segment.SoilProfileProbabilities.Count; } - return total; + return totalCalculationSteps; } } }