Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs =================================================================== diff -u -r1660 -r1674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 1660) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 1674) @@ -30,7 +30,6 @@ using Deltares.DamEngine.Calculators.KernelWrappers.Common; using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces; using Deltares.DamEngine.Calculators.Properties; -using Deltares.DamEngine.Calculators.Sensors; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.General.Specifications.Extensions; @@ -422,7 +421,7 @@ var message = string.Format("Values for sensor with id {0} and name {1} and location {2} and time step {3} already exists. Check the time series data.", sensor.ID, sensor.Name, location.Name, timeStep); - throw new SensorTimeSeriesProcessorException(message); + throw new OperationalCalculatorException(message); } values[timeStep][location].Add(sensor, value); @@ -442,7 +441,7 @@ string.Format("Sensor with name '{0}' and parameter id '{1}' not found in the input time series", sensor.Name, TimeSerie.WaterPressureParameterId); - throw new SensorTimeSeriesProcessorException(message); + throw new OperationalCalculatorException(message); } } @@ -460,7 +459,7 @@ { // TODO log info if (timeSeries.Entries.Count != firstSeriesEntries.Count) - throw new SensorTimeSeriesProcessorException("Invalid data in time series entries. Number of entries differ on each sensor"); + throw new OperationalCalculatorException("Invalid data in time series entries. Number of entries differ on each sensor"); } } @@ -479,15 +478,15 @@ string.Format("Sensor with name '{0}' and parameter id '{1}' not found in the input time series", string.Join(", ", sensorsNotFound.ToArray()), TimeSerie.WaterPressureParameterId); - throw new SensorTimeSeriesProcessorException(message); + throw new OperationalCalculatorException(message); } } private static void ThrowIfTimeEntriesKeysDontMatch(DateTime key, HashSet firstSeriesEntries) { // TODO log info if (!firstSeriesEntries.Contains(key)) - throw new SensorTimeSeriesProcessorException("Invalid data in time series entries. Time entries (date time values) don't match"); + throw new OperationalCalculatorException("Invalid data in time series entries. Time entries (date time values) don't match"); } /// /// Determines whether any of sensor values contains a missing value. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r1644 -r1674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1644) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1674) @@ -70,6 +70,7 @@ + @@ -161,15 +162,6 @@ Resources.resx - - - - - - - - - Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculatorException.cs =================================================================== diff -u --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculatorException.cs (revision 0) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculatorException.cs (revision 1674) @@ -0,0 +1,32 @@ +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the Dam Engine. +// +// The Dam Engine is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; + +namespace Deltares.DamEngine.Calculators.DikesOperational +{ + public class OperationalCalculatorException : Exception + { + public OperationalCalculatorException(string message) : base(message) + { + } + } +} Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/SensorTimeSeriesProcessor.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/SensorLocationSafetyFactorCalculator.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/TimeSerieCalculationException.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/CalculationParameters.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/SensorTimeSeriesProcessorException.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/ICalculator.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/TimeSeriesProcessor.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/SensorCalculationArgument.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1674 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Sensors/TimeSerieCalculationHelper.cs'. Fisheye: No comparison available. Pass `N' to diff?