Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -ra5c551a343fee7ea3d7e46dd36c82cf180a1b597 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision a5c551a343fee7ea3d7e46dd36c82cf180a1b597) @@ -111,7 +111,7 @@ { AssessmentLevelCalculationInput calculationInput = CreateInput(designWaterLevelCalculation, norm, hydraulicBoundaryDatabaseFilePath); - bool calculateIllustrationPoints = designWaterLevelCalculation.GetCalculateIllustrationPoints(); + bool calculateIllustrationPoints = designWaterLevelCalculation.CalculateIllustrationPoints; if (calculateIllustrationPoints) { calculator.CalculateWithIllustrationPoints(calculationInput); @@ -127,23 +127,23 @@ } HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput( - messageProvider, designWaterLevelCalculation.GetName(), calculationInput.Beta, norm, calculator.Converged); + messageProvider, designWaterLevelCalculation.Name, calculationInput.Beta, norm, calculator.Converged); if (calculateIllustrationPoints) { SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult); } - designWaterLevelCalculation.SetOutput(hydraulicBoundaryLocationOutput); + designWaterLevelCalculation.Output = hydraulicBoundaryLocationOutput; } catch (HydraRingCalculationException e) { if (!canceled) { string lastErrorContent = calculator.LastErrorFileContent; log.Error(!string.IsNullOrEmpty(lastErrorContent) - ? messageProvider.GetCalculationFailedMessage(designWaterLevelCalculation.GetName(), lastErrorContent) - : messageProvider.GetCalculationFailedMessage(designWaterLevelCalculation.GetName(), e.Message), + ? messageProvider.GetCalculationFailedMessage(designWaterLevelCalculation.Name, lastErrorContent) + : messageProvider.GetCalculationFailedMessage(designWaterLevelCalculation.Name, e.Message), e); exceptionThrown = true; @@ -156,7 +156,7 @@ bool errorOccurred = CalculationServiceHelper.HasErrorOccurred(canceled, exceptionThrown, lastErrorFileContent); if (errorOccurred) { - log.Error(messageProvider.GetCalculationFailedMessage(designWaterLevelCalculation.GetName(), lastErrorFileContent)); + log.Error(messageProvider.GetCalculationFailedMessage(designWaterLevelCalculation.Name, lastErrorFileContent)); } log.InfoFormat(Resources.DesignWaterLevelCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0, calculator.OutputDirectory); @@ -244,7 +244,7 @@ double norm, string hydraulicBoundaryDatabaseFilePath) { - var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, designWaterLevelCalculation.GetId(), norm); + var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, designWaterLevelCalculation.Id, norm); HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(assessmentLevelCalculationInput, hydraulicBoundaryDatabaseFilePath);