Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IMacroStabilityInwardsCalculatorFactory.cs =================================================================== diff -u -r966dc7335defa901104fd4168d57c08315db2de0 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IMacroStabilityInwardsCalculatorFactory.cs (.../IMacroStabilityInwardsCalculatorFactory.cs) (revision 966dc7335defa901104fd4168d57c08315db2de0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IMacroStabilityInwardsCalculatorFactory.cs (.../IMacroStabilityInwardsCalculatorFactory.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -35,6 +35,6 @@ /// for performing a macro stability inwards calculation. /// The factory responsible for creating the sub calculators. /// The calculator. - IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsSubCalculatorFactory factory); + IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory); } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs =================================================================== diff -u -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -36,7 +36,7 @@ public class MacroStabilityInwardsCalculator : IMacroStabilityInwardsCalculator { private readonly MacroStabilityInwardsCalculatorInput input; - private readonly IMacroStabilityInwardsSubCalculatorFactory factory; + private readonly IMacroStabilityInwardsKernelFactory factory; /// /// Constructs a new . The is used to @@ -46,7 +46,7 @@ /// for performing a macro stability inwards calculation. /// The factory responsible for creating the sub calculators. /// Thrown when or is null. - public MacroStabilityInwardsCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsSubCalculatorFactory factory) + public MacroStabilityInwardsCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory) { if (input == null) { @@ -101,7 +101,7 @@ private IUpliftVanKernel CreateUpliftVanCalculator() { - IUpliftVanKernel calculator = factory.CreateUpliftVanCalculator(); + IUpliftVanKernel calculator = factory.CreateUpliftVanKernel(); calculator.MoveGrid = input.MoveGrid; calculator.MaximumSliceWidth = input.MaximumSliceWidth; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorFactory.cs =================================================================== diff -u -r966dc7335defa901104fd4168d57c08315db2de0 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorFactory.cs (.../MacroStabilityInwardsCalculatorFactory.cs) (revision 966dc7335defa901104fd4168d57c08315db2de0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorFactory.cs (.../MacroStabilityInwardsCalculatorFactory.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -46,7 +46,7 @@ } } - public IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsSubCalculatorFactory factory) + public IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory) { return new MacroStabilityInwardsCalculator(input, factory); } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj =================================================================== diff -u -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj) (revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -63,7 +63,7 @@ - + Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IMacroStabilityInwardsKernelFactory.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IMacroStabilityInwardsKernelFactory.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IMacroStabilityInwardsKernelFactory.cs (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -0,0 +1,35 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU 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 General Public License for more details. +// +// You should have received a copy of the GNU 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. + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.SubCalculator +{ + /// + /// Factory responsible for creating kernels required for performing a macro stability inwards calculation. + /// + public interface IMacroStabilityInwardsKernelFactory + { + /// + /// Creates an Uplift Van kernel. + /// + /// A new . + IUpliftVanKernel CreateUpliftVanKernel(); + } +} \ No newline at end of file Fisheye: Tag 14ce61e9643e427122685384157ec22ddb9b4422 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IMacroStabilityInwardsSubCalculatorFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/MacroStabilityInwardsSubCalculatorFactory.cs =================================================================== diff -u -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/MacroStabilityInwardsSubCalculatorFactory.cs (.../MacroStabilityInwardsSubCalculatorFactory.cs) (revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/MacroStabilityInwardsSubCalculatorFactory.cs (.../MacroStabilityInwardsSubCalculatorFactory.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -24,16 +24,16 @@ /// /// Factory which creates the sub calculators from the macro stability inwards kernel. /// - public class MacroStabilityInwardsSubCalculatorFactory : IMacroStabilityInwardsSubCalculatorFactory + public class MacroStabilityInwardsSubCalculatorFactory : IMacroStabilityInwardsKernelFactory { - private static IMacroStabilityInwardsSubCalculatorFactory instance; + private static IMacroStabilityInwardsKernelFactory instance; private MacroStabilityInwardsSubCalculatorFactory() {} /// - /// Gets or sets an instance of . + /// Gets or sets an instance of . /// - public static IMacroStabilityInwardsSubCalculatorFactory Instance + public static IMacroStabilityInwardsKernelFactory Instance { get { @@ -45,7 +45,7 @@ } } - public IUpliftVanKernel CreateUpliftVanCalculator() + public IUpliftVanKernel CreateUpliftVanKernel() { return new UpliftVanCalculator(); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/MacroStabilityInwardsCalculatorTest.cs =================================================================== diff -u -r8df85402c4de8eb335483bcda5e4ff23ce0dd5ef -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/MacroStabilityInwardsCalculatorTest.cs (.../MacroStabilityInwardsCalculatorTest.cs) (revision 8df85402c4de8eb335483bcda5e4ff23ce0dd5ef) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/MacroStabilityInwardsCalculatorTest.cs (.../MacroStabilityInwardsCalculatorTest.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -44,7 +44,7 @@ { // Setup var mocks = new MockRepository(); - var factory = mocks.Stub(); + var factory = mocks.Stub(); mocks.ReplayAll(); // Call @@ -73,7 +73,7 @@ { // Setup var mocks = new MockRepository(); - var factory = mocks.Stub(); + var factory = mocks.Stub(); mocks.ReplayAll(); var input = new MacroStabilityInwardsCalculatorInput(CreateSimpleConstructionProperties()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryTest.cs =================================================================== diff -u -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryTest.cs (.../MacroStabilityInwardsSubCalculatorFactoryTest.cs) (revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryTest.cs (.../MacroStabilityInwardsSubCalculatorFactoryTest.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -32,7 +32,7 @@ public void Instance_Always_ReturnsAnInstance() { // Call - IMacroStabilityInwardsSubCalculatorFactory factory = MacroStabilityInwardsSubCalculatorFactory.Instance; + IMacroStabilityInwardsKernelFactory factory = MacroStabilityInwardsSubCalculatorFactory.Instance; // Assert Assert.IsNotNull(factory); @@ -42,11 +42,11 @@ public void Instance_WhenSetToNull_ReturnsANewInstance() { // Setup - IMacroStabilityInwardsSubCalculatorFactory firstFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; + IMacroStabilityInwardsKernelFactory firstFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; MacroStabilityInwardsSubCalculatorFactory.Instance = null; // Call - IMacroStabilityInwardsSubCalculatorFactory secondFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; + IMacroStabilityInwardsKernelFactory secondFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; // Assert Assert.AreNotSame(firstFactory, secondFactory); @@ -60,7 +60,7 @@ MacroStabilityInwardsSubCalculatorFactory.Instance = firstFactory; // Call - IMacroStabilityInwardsSubCalculatorFactory secondFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; + IMacroStabilityInwardsKernelFactory secondFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; // Assert Assert.AreSame(firstFactory, secondFactory); @@ -70,10 +70,10 @@ public void CreateUpliftVanCalculator_Always_ReturnNewUpliftVanCalculator() { // Setup - IMacroStabilityInwardsSubCalculatorFactory factory = MacroStabilityInwardsSubCalculatorFactory.Instance; + IMacroStabilityInwardsKernelFactory factory = MacroStabilityInwardsSubCalculatorFactory.Instance; // Call - IUpliftVanKernel subCalculator = factory.CreateUpliftVanCalculator(); + IUpliftVanKernel subCalculator = factory.CreateUpliftVanKernel(); // Assert Assert.IsNotNull(subCalculator); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryConfigTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryConfigTest.cs (.../MacroStabilityInwardsSubCalculatorFactoryConfigTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryConfigTest.cs (.../MacroStabilityInwardsSubCalculatorFactoryConfigTest.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -55,7 +55,7 @@ public void Dispose_Always_ResetsFactoryToPreviousValue() { // Setup - IMacroStabilityInwardsSubCalculatorFactory expectedFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; + IMacroStabilityInwardsKernelFactory expectedFactory = MacroStabilityInwardsSubCalculatorFactory.Instance; // Call using (new MacroStabilityInwardsSubCalculatorFactoryConfig()) {} Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactoryTest.cs =================================================================== diff -u -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsSubCalculatorFactoryTest.cs) (revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsSubCalculatorFactoryTest.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -35,7 +35,7 @@ var factory = new TestMacroStabilityInwardsSubCalculatorFactory(); // Assert - Assert.IsInstanceOf(factory); + Assert.IsInstanceOf(factory); Assert.IsNotNull(factory.LastCreatedUpliftVanCalculator); } @@ -46,7 +46,7 @@ var factory = new TestMacroStabilityInwardsSubCalculatorFactory(); // Call - IUpliftVanKernel subCalculator = factory.CreateUpliftVanCalculator(); + IUpliftVanKernel subCalculator = factory.CreateUpliftVanKernel(); // Assert Assert.AreSame(factory.LastCreatedUpliftVanCalculator, subCalculator); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryConfig.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryConfig.cs (.../MacroStabilityInwardsSubCalculatorFactoryConfig.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/MacroStabilityInwardsSubCalculatorFactoryConfig.cs (.../MacroStabilityInwardsSubCalculatorFactoryConfig.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -42,7 +42,7 @@ /// public class MacroStabilityInwardsSubCalculatorFactoryConfig : IDisposable { - private readonly IMacroStabilityInwardsSubCalculatorFactory previousFactory; + private readonly IMacroStabilityInwardsKernelFactory previousFactory; /// /// Creates a new instance of . Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactory.cs =================================================================== diff -u -rdea4b8c2f53fe77b14bdcf4bce131f47ece21664 -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactory.cs (.../TestMacroStabilityInwardsSubCalculatorFactory.cs) (revision dea4b8c2f53fe77b14bdcf4bce131f47ece21664) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/SubCalculator/TestMacroStabilityInwardsSubCalculatorFactory.cs (.../TestMacroStabilityInwardsSubCalculatorFactory.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -27,7 +27,7 @@ /// This class allows for retrieving the created sub calculators, so that /// tests can be performed upon them. /// - public class TestMacroStabilityInwardsSubCalculatorFactory : IMacroStabilityInwardsSubCalculatorFactory + public class TestMacroStabilityInwardsSubCalculatorFactory : IMacroStabilityInwardsKernelFactory { /// /// Creates a new instance of . @@ -39,7 +39,7 @@ public UpliftVanCalculatorStub LastCreatedUpliftVanCalculator { get; } - public IUpliftVanKernel CreateUpliftVanCalculator() + public IUpliftVanKernel CreateUpliftVanKernel() { return LastCreatedUpliftVanCalculator; } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/TestMacroStabilityInwardsCalculatorFactory.cs =================================================================== diff -u -r1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e -r14ce61e9643e427122685384157ec22ddb9b4422 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/TestMacroStabilityInwardsCalculatorFactory.cs (.../TestMacroStabilityInwardsCalculatorFactory.cs) (revision 1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/TestMacroStabilityInwardsCalculatorFactory.cs (.../TestMacroStabilityInwardsCalculatorFactory.cs) (revision 14ce61e9643e427122685384157ec22ddb9b4422) @@ -41,7 +41,7 @@ /// public MacroStabilityInwardsCalculatorStub LastCreatedCalculator { get; } - public IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsSubCalculatorFactory factory) + public IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory) { LastCreatedCalculator.Input = input; return LastCreatedCalculator;