Riskeer

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
Last Commit: 26 Nov
Commits this week: 0

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
Wednesday 24 Aug 2022
2:18 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Wired combined assembly section result collection in the ExportableAssessmentSectionFactory

Options
    • -11
    • +27
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
    • -8
    • +17
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
2:15 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Removed old test data. WTI-2765

Options
    • -435
    • +0
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/assemblage.xsd
    • -112
    • +0
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml
2:15 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fixed xsd test. WTI-2765

Options
    • -5
    • +4
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs
    • -3
    • +3
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/configuredAssembly.gml
    • -34
    • +34
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml
2:14 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Added xsd validation test. WTI-2765

Options
    • -0
    • +53
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
    • -0
    • +140
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/xsd/1998/namespace/xml.xsd
    • -0
    • +157
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/xsd/BOI2023/imwaproxies/v20210113/BOI2023_IMWA Proxies_v1_0.xsd
    • -0
    • +572
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/xsd/BOI2023/uitwisselmodel/v20210113/BOI2023_Uitwisselmodel_v1_0.xsd
    • -0
    • +856
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/xsd/gml/3.2/ihw-gml.xsd
    • -0
    • +3
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/xsd/readme.txt
    • -0
    • +6
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/xsd/xlink/1.0.0/ReadMe.txt
    • -0
    • +238
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/xsd/xlink/1.0.0/xlinks.xsd
1:39 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Adapted AssemblyExporterTest. WTI-2765

Options
    • -1
    • +0
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs
    • -1
    • +1
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssemblyFactoryTest.cs
    • -995
    • +1230
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml
1:39 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Updated XMLDocs

Options
    • -14
    • +26
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableModelRegistry.cs
1:33 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Fix SonarQube smell. WTI-2765

Options
    • -6
    • +6
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs
11:57 am

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Added factory method to create collections of ExportableCombinedFailureMechanismSection

Options
    • -2
    • +50
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionCollectionFactory.cs
    • -2
    • +57
    /Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyResultTestFactory.cs
    • -40
    • +3
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
    • -4
    • +118
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionCollectionFactoryTest.cs
11:50 am

Robert Tangerman <robert.tangerman@deltares.nl>

Merge branch 'Release22_1'

Options
11:50 am

Robert Tangerman <robert.tangerman@deltares.nl>

Enabled assembly export. WTI-2765

Options
    • -1
    • +1
    /Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
    • -1
    • +24
    /Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/AssemblyResultsContextExportInfoTest.cs
11:44 am

Robert Tangerman <robert.tangerman@deltares.nl>

Created separate factory for failure mechanism section assembly results. WTI-2765

Options
    • -10
    • +30
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs
    • -25
    • +8
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs
    • -0
    • +110
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionAssemblyResultFactory.cs
    • -63
    • +0
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs
    • -0
    • +205
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionAssemblyResultFactoryTest.cs
11:06 am

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Added factory method to create ExportableCombinedFailureMechanismSection

Options
    • -0
    • +51
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionFactory.cs
    • -0
    • +53
    /Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyResultTestFactory.cs
    • -0
    • +1
    /Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/Riskeer.Integration.Data.TestUtil.csproj
    • -5
    • +117
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionFactoryTest.cs
    • -13
    • +2
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableModelRegistryTest.cs
    • -0
    • +1
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Riskeer.Integration.IO.Test.csproj
11:04 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added documentation. WTI-2765

Options
    • -0
    • +2
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssemblyFactory.cs
    • -2
    • +23
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
10:47 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added error handling. WTI-2765

Options
    • -0
    • +9
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
    • -0
    • +26
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
10:30 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added error handling. WTI-2765

Options
    • -19
    • +6
    /Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/AssemblyExporter.cs
    • -3
    • +2
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs
10:29 am

Robert Tangerman <robert.tangerman@deltares.nl>

Added error handling. WTI-2765

Options
    • -7
    • +20
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs
    • -1
    • +64
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs
10:19 am

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Updated registry: - Remove methods to register collections as these are not necessary - Added method to register CombinedSectionAssemblyResult with an associated ExportableCombinedFailureMechanismSection

Options
    • -9
    • +2
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionCollectionFactory.cs
    • -22
    • +22
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableModelRegistry.cs
    • -27
    • +3
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionCollectionFactoryTest.cs
    • -12
    • +44
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableModelRegistryTest.cs
10:05 am

Dennis Tang <dennis.tang@deltares.nl>

Revert "WTI-2765: Simplified registry:"

This reverts commit 838241db2e78d6f4dc62648bca2fc58aec061365.

Options
    • -6
    • +6
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
    • -6
    • +6
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs
    • -2
    • +8
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionCollectionFactory.cs
    • -2
    • +2
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionFactory.cs
    • -115
    • +0
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableFailureMechanismSectionRegistry.cs
    • -0
    • +194
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableModelRegistry.cs
    • -13
    • +13
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs
    • -6
    • +30
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionCollectionFactoryTest.cs
    • -4
    • +4
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionFactoryTest.cs
    • -163
    • +0
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableFailureMechanismSectionRegistryTest.cs
    • -0
    • +267
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableModelRegistryTest.cs
8:47 am

Robert Tangerman <robert.tangerman@deltares.nl>

Renamed exception. WTI-2765

Options
    • -68
    • +0
    /Riskeer/Integration/src/Riskeer.Integration.IO/Exceptions/AssemblyCreatorException.cs
    • -0
    • +68
    /Riskeer/Integration/src/Riskeer.Integration.IO/Exceptions/AssemblyFactoryException.cs
    • -1
    • +1
    /Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/AssemblyExporter.cs
    • -32
    • +0
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exceptions/AssemblyCreatorExceptionTest.cs
    • -0
    • +32
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exceptions/AssemblyFactoryExceptionTest.cs
Tuesday 23 Aug 2022
3:52 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Cleanup: - Adjusted test name

Options
    • -2
    • +2
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
3:49 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Simplified registry: - Collections are not necessary to be linked or registered

Options
    • -5
    • +5
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
    • -6
    • +6
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs
    • -8
    • +2
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionCollectionFactory.cs
    • -2
    • +2
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionFactory.cs
    • -0
    • +115
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableFailureMechanismSectionRegistry.cs
    • -194
    • +0
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableModelRegistry.cs
    • -13
    • +13
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs
    • -30
    • +6
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionCollectionFactoryTest.cs
    • -4
    • +4
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismSectionFactoryTest.cs
    • -0
    • +163
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableFailureMechanismSectionRegistryTest.cs
    • -267
    • +0
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableModelRegistryTest.cs
3:18 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Cleanup: - Removed obsolete Resources

Options
    • -81
    • +0
    /Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs
    • -27
    • +0
    /Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx
3:15 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Cleanup: - Adjusted the id generator to generate ids based on the AssessmentSection

Options
    • -1
    • +1
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
    • -4
    • +4
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/IdentifierGenerator.cs
    • -7
    • +12
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/IdentifierGeneratorTest.cs
3:06 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Removed obsolete helper: - Registry keeps track of the created exportable objects

Options
    • -71
    • +0
    /Riskeer/Integration/src/Riskeer.Integration.IO/Helpers/ExportableFailureMechanismSectionHelper.cs
    • -95
    • +0
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Helpers/ExportableFailureMechanismSectionHelperTest.cs
3:05 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Wired the registry to the exportable components in the exportable failure mechanism factory.

Options
    • -1
    • +4
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionTestHelper.cs
    • -20
    • +23
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
    • -18
    • +28
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs
    • -0
    • +9
    /Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs
    • -0
    • +3
    /Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx
    • -12
    • +59
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs
2:58 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Refactored ExportableFailureMechanismCombinedSectionAssemblyResult. WTI-2765

Options
    • -3
    • +3
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs
    • -28
    • +21
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismCombinedSectionAssemblyResult.cs
    • -54
    • +0
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismSubSectionAssemblyResult.cs
    • -6
    • +7
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
    • -16
    • +16
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismCombinedSectionAssemblyResultTest.cs
    • -50
    • +0
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSubSectionAssemblyResultTest.cs
    • -58
    • +0
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSubSectionAssemblyResultTestFactory.cs
    • -8
    • +8
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
    • -5
    • +2
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
    • -4
    • +2
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
2:41 pm

Robert Tangerman <robert.tangerman@deltares.nl>

Refactored ExportableCombinedSectionAssembly. WTI-2765

Options
    • -5
    • +4
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs
    • -13
    • +31
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableCombinedSectionAssembly.cs
    • -3
    • +2
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
    • -18
    • +27
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableCombinedSectionAssemblyTest.cs
    • -7
    • +7
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
    • -8
    • +8
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
    • -2
    • +2
    /Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
2:31 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Wired the id generator to the exportable components in the exportable failure mechanism factory.

Options
    • -0
    • +2
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs
    • -8
    • +6
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs
2:13 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Cleanup: - Removed obsolete constructor

Options
    • -23
    • +0
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableAssessmentSection.cs
2:08 pm

Dennis Tang <dennis.tang@deltares.nl>

WTI-2765: Changed the ExportableFailureMechanismSectionAssemblyWithProbabilityResult to the baseclass in the consumers: - Removed obsolete derived class

Options
    • -2
    • +2
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs
    • -52
    • +0
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismSectionAssemblyWithProbabilityResult.cs
    • -1
    • +1
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableGenericFailureMechanism.cs
    • -1
    • +1
    /Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableSpecificFailureMechanism.cs
    • -4
    • +4
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs
    • -62
    • +0
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionAssemblyWithProbabilityResultTest.cs
    • -5
    • +5
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismTest.cs
    • -2
    • +2
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableGenericFailureMechanismTest.cs
    • -2
    • +2
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableSpecificFailureMechanismTest.cs
    • -30
    • +0
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestFactory.cs
    • -2
    • +2
    /Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs
    • -7
    • +7
    /Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs