Riskeer

Clone Tools

Stats

Commits this week: 28
Total Committers: 31
Last Commit: 17 Apr
Commits this week: 28

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 20 Apr 2018
12:52 pm

Dennis Tang <dennis.tang@deltares.nl>

Incorporated comments review 2734: - Cleaned up tests

Paired with ~carloslubbers

WTI-1670

Options
    • -38
    • +38
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
    • -10
    • +2
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs
11:42 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Implement review comments WTI-1670

Options
    • -14
    • +11
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs
11:27 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Merge master into 1670

Options
    • -1
    • +2
    /Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
    • -1
    • +2
    /Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
11:25 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Implement review comments WTI-1670

Options
    • -36
    • +15
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs
    • -3
    • +3
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
    • -0
    • +1
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs
11:19 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Implement review comments WTI-1670

Options
    • -1
    • +2
    /Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs
    • -2
    • +2
    /Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs
    • -2
    • +2
    /Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
    • -17
    • +11
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
    • -35
    • +40
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
    • -30
    • +42
    /Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs
10:43 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to wave impact asphalt cover failure mechanism WTI-1686

Options
    • -8
    • +20
    /Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismProperties.cs
    • -12
    • +28
    /Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs
10:42 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to stability stone cover failure mechanism WTI-1686

Options
    • -5
    • +17
    /Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailureMechanismProperties.cs
    • -8
    • +24
    /Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismPropertiesTest.cs
10:38 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to stability point structures failure mechanism WTI-1686

Options
    • -8
    • +21
    /Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs
    • -10
    • +27
    /Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs
10:26 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to macro stability inwards failure mechanism WTI-1686

Options
    • -2
    • +14
    /Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs
    • -9
    • +25
    /Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs
10:24 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to macro stability outwards failure mechanism WTI-1686

Options
    • -6
    • +18
    /Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismProperties.cs
    • -9
    • +25
    /Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismPropertiesTest.cs
10:22 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to piping structure failure mechanism WTI-1686

Options
    • -3
    • +15
    /Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailureMechanismProperties.cs
    • -6
    • +22
    /Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/PipingStructureFailureMechanismPropertiesTest.cs
10:11 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to standalone failure mechanisms WTI-1686

Options
    • -2
    • +14
    /Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailureMechanismProperties.cs
    • -30
    • +21
    /Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/StandAloneFailureMechanismPropertiesTest.cs
10:11 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to height structures failure mechanism WTI-1686

Options
    • -6
    • +19
    /Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismProperties.cs
    • -8
    • +25
    /Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs
10:05 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to grass cover outwards failure mechanism WTI-1686

Options
    • -6
    • +18
    /Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs
    • -8
    • +25
    /Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs
10:00 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to grass cover inwards failure mechanism WTI-1686

Options
    • -0
    • +1
    /Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs
    • -0
    • +13
    /Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs
    • -9
    • +26
    /Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs
9:44 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to dune erosion failure mechanism WTI-1686

Options
    • -3
    • +16
    /Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs
    • -5
    • +21
    /Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs
9:38 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to closing structures failure mechanism WTI-1686

Options
    • -10
    • +23
    /Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailureMechanismProperties.cs
    • -13
    • +29
    /Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailureMechanismPropertiesTest.cs
9:12 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add property to piping failure mechanism WTI-1686

Options
    • -0
    • +18
    /Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
    • -0
    • +6
    /Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
    • -3
    • +15
    /Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs
    • -20
    • +36
    /Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs
9:01 am

Carlos Lubbers <carlos.lubbers@deltares.nl>

Rename to just Group WTI-1686

Options
    • -1
    • +1
    /Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs
    • -4
    • +6
    /Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs
    • -2
    • +2
    /Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs
    • -1
    • +1
    /Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/OtherFailureMechanismTest.cs
    • -4
    • +4
    /Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs
    • -1
    • +1
    /Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs
  16. … 8 more files in changeset.
Thursday 19 Apr 2018
4:47 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assert to test failure mechanism WTI-1686

Options
    • -0
    • +1
    /Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs
4:43 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Fix failing tests WTI-1686

Options
    • -1
    • +1
    /Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs
    • -2
    • +2
    /Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs
    • -1
    • +1
    /Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsFailureMechanismResultViewInfoTest.cs
  16. … 4 more files in changeset.
4:43 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to wave impact asphalt cover WTI-1686

Options
    • -1
    • +1
    /Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs
    • -0
    • +1
    /Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs
4:43 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to stability stone cover WTI-1686

Options
    • -1
    • +1
    /Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs
    • -0
    • +1
    /Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs
4:41 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to stability point structures WTI-1686

Options
    • -1
    • +1
    /Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs
    • -0
    • +1
    /Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs
4:41 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to piping WTI-1686

Options
    • -1
    • +1
    /Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs
    • -0
    • +1
    /Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs
4:41 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to macro stability inwards WTI-1686

Options
    • -1
    • +1
    /Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs
    • -0
    • +1
    /Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs
4:40 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to standalones WTI-1686

Options
    • -1
    • +1
    /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs
    • -1
    • +1
    /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs
    • -1
    • +1
    /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs
    • -1
    • +1
    /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs
    • -1
    • +1
    /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs
    • -1
    • +3
    /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanism.cs
    • -1
    • +1
    /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs
    • -0
    • +2
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs
    • -0
    • +2
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs
    • -0
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MacroStabilityOutwardsFailureMechanismTest.cs
    • -0
    • +2
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs
    • -0
    • +2
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs
    • -0
    • +2
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismTest.cs
    • -0
    • +1
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/TechnicalInnovationFailureMechanismTest.cs
    • -0
    • +2
    /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs
4:39 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to height structures WTI-1686

Options
    • -1
    • +1
    /Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
    • -0
    • +1
    /Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
4:39 pm

Carlos Lubbers <carlos.lubbers@deltares.nl>

Add assembly group to grass cover erosion outwards WTI-1686

Options
    • -1
    • +1
    /Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs
    • -0
    • +1
    /Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs
4:39 pm

Elmar Kleijn

Review related changes. WTI-1570

Options
    • -1
    • +1
    /Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs
    • -1
    • +1
    /Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs
    • -3
    • +3
    /Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs