Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged revision(s) from branches/1444

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@12811 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: cf752322c5967ec6824f11c711b243f30bf67f0e

Former-commit-id: 9753484fe13d42b8eb5a3c526c4d37f40ca70446

    • binary
    ./HydraRingSettingsDatabaseReader/7_67-empty.config.sqlite
    • binary
    ./HydraRingSettingsDatabaseReader/7_67-invalid-value-types.config.sqlite
    • binary
    ./HydraRingSettingsDatabaseReader/7_67.config.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/complete.config.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorFalse.config.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorFalse.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorTrue.config.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorTrue.sqlite
  1. … 237 more files in changeset.
Set the use preprocessor flag from within the calculation services. Related to Issue [WTI-1476]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/1444@12754 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 44f408a17fa5b1fd23da81601ab2da099cf7611b

Former-commit-id: deae48a0d2417ca39e75ed03258d54657f03dba5

    • binary
    ./HydraulicBoundaryDatabaseImporter/complete.config.sqlite
  1. … 25 more files in changeset.
Integrated reading whether the preprocessor can be used for the imported database. Related to Issue [WTI-1478]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/1444@12745 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: de072ab2c5f6ae59e9b877fc71a21a6f1f06359b

Former-commit-id: 8642f3daa094f58a80030fd7ab70f29e70e12a9a

    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorFalse.config.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorFalse.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorTrue.config.sqlite
    • binary
    ./HydraulicBoundaryDatabaseImporter/withUsePreprocessor/completeUsePreprocessorTrue.sqlite
  1. … 2 more files in changeset.
Added reading the excluded preprocessor locations from the database. Related to Issue [WTI-1476]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/1444@12686 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 67e9d08d389b69da45636bf17a491d8bebb067ca

Former-commit-id: 74324e4b87143f13d0454f382c0f4492a075d946

    • binary
    ./HydraRingSettingsDatabaseReader/7_67-invalid-value-types.config.sqlite
    • binary
    ./HydraRingSettingsDatabaseReader/7_67.config.sqlite
  1. … 2 more files in changeset.
Added tests for getting preprocessor and numerics settings. Related to Issue [WTI-1476]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/1444@12684 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 0dfc87cbaad74bacfd86e3bf7470b8b490d24531

Former-commit-id: b90e1aa3c33751741368a3153c4da5e8b65e3ecb

    • binary
    ./HydraRingSettingsDatabaseReader/7_67.config.sqlite
  1. … 5 more files in changeset.
Implemented reading the preprocessor settings table from the config file. Related to Issue [WTI-1476]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/1444@12659 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 5c9c994ec3ac94bd94fc792f0474a45225998508

Former-commit-id: 48ffb031c4ad4dfcefd17250894a94123b481173

    • binary
    ./HydraRingSettingsDatabaseReader/7_67-empty.config.sqlite
    • binary
    ./HydraRingSettingsDatabaseReader/7_67-invalid-value-types.config.sqlite
    • binary
    ./HydraRingSettingsDatabaseReader/7_67.config.sqlite
  1. … 6 more files in changeset.
Added extra test case for reading 2D soil profiles with nested layers. Related to Issue [WTI-1449]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@12514 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: c132cf92c834d421708d2aa0f8cc9e217cd8e50f

Former-commit-id: d1997b468113c6661e704278db07e81a65832f1e

    • binary
    ./SoilProfile2DReader/2dprofileNestedLayers.soil
  1. … 1 more file in changeset.
Incorporated comments dev: - Moved validation logic from readers to transformers and RT datamodel (stochastic soil profiles): -- Fixed buildserver => added missing file Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@12011 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: d2b0fa224f161f0190697a2dc6f435358283ca5e

Former-commit-id: 1ed2185af30f7b5c1a96a358565560dc4a3f6f3c

    • binary
    ./StochasticSoilModelReader/modelsWithAndWithoutGeometry.soil
Incorporated comments dev: - Moved validation logic from readers to transformers and RT datamodel (stochastic soil profiles): -- Removed validation for the probability from the generic IO StochasticSoilModel -- Removed AddProbability function from the generic IO StochasticSoilModel -- Removed obsolete reference -- Introduced a StochasticSoilProfileTestFactory to create valid configured test objects

Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@12010 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 02b2688e6b19921c4303f911652a784de85cb953

Former-commit-id: d3b124e7165301d331a9093f4a6c45a274737cf3

    • binary
    ./StochasticSoilModelReader/modelWithStochasticSoilProfile1D.soil
    • binary
    ./StochasticSoilModelReader/modelWithStochasticSoilProfile2D.soil
    • binary
    ./StochasticSoilModelReader/modelWithoutStochasticSoilProfiles.soil
    • binary
    ./StochasticSoilModelReader/modelsWithAndWithoutStochasticSoilProfiles.soil
    • binary
    ./StochasticSoilModelReader/skippedStochasticSoilModel.soil
  1. … 19 more files in changeset.
Add illustratiepunteninlezen xml elements to calculation configuration importer and exporter Related to Issue [WTI-1385]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11970 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 7176d3b20eae80e886690b597a4e49b523821e3a

Former-commit-id: 244f15b869ac0a797fb2fc3f1e05d94ee2db449b

    • -0
    • +1
    ./StructureCalculationConfigurationWriter/structureCalculationWithAllParametersSet.xml
  1. … 80 more files in changeset.
Incorporated comments dev: - Fixed failing tests on buildserver - Moved validation logic from readers to transformers and RT datamodel (Macrostability only): -- Introduced testfactories to create valid RT and Reader soil models (with geometry defined) -- Removed obsolete constructor Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11965 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: f2f84a442ab3fc8368459e5118dc2db35b5f9a4a

Former-commit-id: 62456eff75ae7a3761bf0a3b3d5ba34092394db1

    • binary
    ./StochasticSoilModelReader/modelWithoutGeometry.soil
  1. … 35 more files in changeset.
Incorporated comments dev: - Cleaned up unused resources - Moved validation logic from the Reader to the transformers and respective RT data structures: -- Performed for the SoilModel: - Removed geometry validation in the reader, but: - Implemented for MacroStability only at this stage: -- Check if geometry is not empty Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11964 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 31fb365b2611d19fafeef02d50d223c477b45431

Former-commit-id: 123d35eb149285fe827c58fb12bc95af78eb71ad

    • binary
    ./StochasticSoilModelReader/skippedStochasticSoilModel.soil
  1. … 41 more files in changeset.
Incorporated comments dev: - Moved validation logic from the Reader to the transformers and respective RT data structures: -- Performed for the SoilProfile2D: => Amount of layers > 0 => All layer tops > bottom Moved to their respective transformers - Adjusted SoilProfile2D query to cope with files without soil layers - Added missing asserts for the 1D profiles => assert exception messages

Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11954 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: eacb5a09716a4f76ca79c990a88775a7ecfdcfd6

Former-commit-id: 22556b45a12fb6ebacd14366a6228ccb1a65a514

    • binary
    ./SoilProfile2DReader/2dProfileNoLayers.soil
  1. … 12 more files in changeset.
Incorporated comments dev: - Moved validation logic from the Reader to the transformers and respective RT data structures: -- Performed for the SoilProfile1D: --- Adjusted query such that it can also retrieve information when it has no layers --- Adjusted reader to move the iterator to the next profile once it is done reading => prevents infinite loop when reading a .soil file without layers --- Added missing test

Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11947 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: bab1a6e17151b47ceecd5f550d5cf86a86a7fb8c

Former-commit-id: 5a4ebf1e155df80ced059c5bcfaf8fd1c224a6d2

    • binary
    ./SoilProfile1DReader/1dprofileNoLayers.soil
  1. … 5 more files in changeset.
Incorporated comments review 2110 - Updated XMLDoc - Adjusted test files to better assert behaviour -- Adjusted tests such that valid means are always provided Related to Issue [WTI-1341]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11883 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 8960921868397d83f257a1d55ac8dbea38e7725e

Former-commit-id: 42de2d44cd8a94e6afc6c4b0b750bf1a4b2c047d

    • binary
    ./PreconsolidationStressReader/2dprofileWithPreconsolidationStressesAndUnparsableValues.soil
  1. … 12 more files in changeset.
Updated signature of AssessmentSection Removed 'default norm' from FailureMechanismContribution Extended storage tests to assert norm values Introduced FailureMechanismContributionTestFactory for creating a valid FailureMechanismContribution XMLdoc added Related to Issue [WTI-1364]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11827 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 3e91b6f849b7221fcfffd0062db5af3b43452bb4

Former-commit-id: 3467771735fb1c58e74ec9b8b4d67998db6f892e

    • binary
    ./ReferenceLineMetaImporter/InvalidNorm/invalidNorm.dbf
    • -0
    • +1
    ./ReferenceLineMetaImporter/InvalidNorm/invalidNorm.prj
    • -0
    • +1
    ./ReferenceLineMetaImporter/InvalidNorm/invalidNorm.qpj
    • binary
    ./ReferenceLineMetaImporter/InvalidNorm/invalidNorm.shp
    • binary
    ./ReferenceLineMetaImporter/InvalidNorm/invalidNorm.shx
  1. … 45 more files in changeset.
Incorporated comments review 2103: - Added missing test cases for the SoilProfile2DReader => should throw exceptions when unparseable data is found and be able to continue reading remaining profiles -- Added missing file to fix buildserver

Related to Issue [WTI-1341]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11822 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: ac1fa7a5a992dff6b34ec1c6613b98d820f95234

Former-commit-id: 28e6feb7981112d7a34a0114163da56292504945

    • binary
    ./SoilProfile2DReader/2dProfilesWithAndWithoutPreconsolidationStressesUnparsableValues.soil
Incorporated comments review 2103: - Adjusted PreconsolidationStressReader -- Removed soilProfileId parameter => reader functions as an iterator, thus it makes no sense to look up values belonging to a specific ID -- Added missing test cases for the SoilProfile2DReader => should throw exceptions when unparseable data is found and be able to continue reading remaining profiles - Small refactoring of the factory => removed duplicate initialization

Related to Issue [WTI-1341]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11820 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 6cdefc7ccf3d0589d20dd40adb405e59dc1c9392

Former-commit-id: 021c25f083351eda16c7168e39de2215c1543c6c

    • binary
    ./PreconsolidationStressReader/2dprofileWithPreconsolidationStressesAndUnparsableValues.soil
    • binary
    ./SoilProfile2DReader/2dProfilesWithSoilLayersUnparsableValues.soil
  1. … 7 more files in changeset.
Incorporated comments tester: - Changed PreconsolidationStressReader => read performs a read when the soil profile ID is specified in order to match the preconsolidation stresses with the correct soil profile Related to Issue [WTI-1341]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11757 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 61279135892c0ffa6f554dbb6c02d49c442fe989

Former-commit-id: 6a9b6b6759df9eaeff375054e717807730b0f267

    • binary
    ./SoilProfile2DReader/2dProfilesWithAndWithoutPreconsolidationStresses.soil
  1. … 4 more files in changeset.
- Connected the PreconsolidationStressReader with the SoilProfile2DReader: -- Updated demo file DR6: added column ST_ID which contains foreign keys to stochast values of the PreconsolidationStresses table => required to maintain passing tests in integration - Formatted XMLDoc

Related to Issue [WTI-1341]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11709 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: f31632d9d7a8ddd74cdc708b0b2227bb82757462

Former-commit-id: f2963266460cc03911cf9cbec75f41c1e6a916b1

    • binary
    ./SoilProfile2DReader/2dprofileWithPreconsolidationStresses.soil
    • binary
    ./SoilProfile2DReader/2dprofileWithPreconsolidationStressesNullValues.soil
  1. … 6 more files in changeset.
- Introduced preconsolidationstress reader: -- Added test data - Renamed PreconsolidationStressProperties => this object actually represents the read values (although they could be seen as properties, similar to the LayerProperties) - Updated table definitions => removed duplicate definitions, renamed distribution to distribution type to prevent confusion

Related to Issue [WTI-1341]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11705 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 698bddb2213465134f459d4f8247f6b58dab27f1

Former-commit-id: 588b25c6093ccce5441240903050422f421bdd7a

    • binary
    ./PreconsolidationStressReader/2dprofileWithPreconsolidationStresses.soil
    • binary
    ./PreconsolidationStressReader/2dprofileWithPreconsolidationStressesNullValues.soil
    • binary
    ./PreconsolidationStressReader/emptySchema.soil
    • -0
    • +1
    ./PreconsolidationStressReader/text.txt
  1. … 10 more files in changeset.
Adjusted SoilProfile2DReader: - Added missing test for a DSoil file with a layer that only contains NULL values -- Added test file

Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11544 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 64a31e1f1e8cbff434101c9d8ceaaefa19e63d2f

Former-commit-id: b263a2d662534fe5a9e0dfbb43cca8c28474454b

    • binary
    ./SoilProfile2DReader/2dprofileWithLayerWithNullValuesOnly.soil
  1. … 1 more file in changeset.
Adjusted SoilProfile2DReader: - Added missing asserts - Added properties that have to be set on the soil layer base - Adjusted test: -- Only ReadSoilProfile should be tested, not the iterator around it -- Removed irrelevant 1D profile from the test-data Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11542 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: c9835394b88362777a0a5ec739607a3ca8c40204

Former-commit-id: e1817242a847a78209db4676cf8a8d4b4db6b7ae

    • binary
    ./SoilProfile1DReader/1dprofile.soil
    • binary
    ./SoilProfile2DReader/1dprofile.soil
    • binary
    ./SoilProfile2DReader/2dprofile.soil
  1. … 4 more files in changeset.
Adjusted SoilProfile1DReader: - Added missing test for a DSoil file with a layer that only contains NULL values -- Added test file

Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11536 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: c5831a7137d8f7b44d51b08992f72a8edf54f148

Former-commit-id: fd93844941ac681c92f30500b50f788db3351cbf

    • binary
    ./SoilProfile1DReader/1dprofileWithLayerWithNullValuesOnly.soil
  1. … 1 more file in changeset.
Adjusted datamodel (SoilLayerBase): - Converted UsePop and ShearStrengthModel to NULLABLE double -- Commented out parts of the transformer due to side effects of changes in UsePop and ShearStrengthModel - Removed ShearStrengthModelConverter => conversion will be done in the transformer - Adjusted test file for the SoilProfile1DReader Related to Issue [WTI-1340]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11529 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: df9160092b326a752e4971fcfcdf364e6b1a1d41

Former-commit-id: 5af32646600396726f8e2bae785ea43663e4e1cc

    • binary
    ./SoilProfile1DReader/1dprofile.soil
  1. … 9 more files in changeset.
Review related changes for SoilProfileReaders: - Created corrupted files with corrupt schema Related to Issue [WTI-1291]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11431 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 35e73f622622852e2a9d330007a1f669f81057f3

Former-commit-id: f6577b8eaf0ee79adbe801a74b3b962ea8210f2c

    • binary
    ./SoilProfile1DReader/1dprofileInvalidId.soil
    • binary
    ./SoilProfile2DReader/2dprofileWithInvalidId.soil
  1. … 2 more files in changeset.
Review related changes for SoilProfile2DReader Related to Issue [WTI-1291]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11424 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: c7bb8cc517d89e48350468c19ee083ccb5820f52

Former-commit-id: 79638324e410e6fdea389f07930efd7ba03f78e1

    • binary
    ./SoilProfile2DReader/2dprofileWithInvalidGeometry.soil
  1. … 2 more files in changeset.
Review related changes for SoilProfile1DReader Related to Issue [WTI-1291]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11421 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 1dee696d95518f9ea29102f35bdef7c9fc696fd0

Former-commit-id: f529ed35181b36396d50ecac82af45bd7a0c1db0

    • binary
    ./SoilProfile1DReader/1dprofileWithInvalidBottom.soil
    • binary
    ./SoilProfile1DReader/1dprofileWithInvalidTopLayer.soil
  1. … 6 more files in changeset.
Refactored SoilProfile**Reader to move to next profile when a profile cannot be read Refactored exception messages Related to Issue [WTI-1291]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11396 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: fa8ec3a953f8f2be770a2a0eef6cd1791e2881b2

Former-commit-id: 700c33f5ffb631b41339061c4f8118a6db075ba2

    • binary
    ./SoilProfile2DReader/2dProfileWithXInvalid.soil
  1. … 5 more files in changeset.
Review related changes: - Refactored API of SegmentPointReader - Updated XMLdoc Related to Issue [WTI-1291]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@11388 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 014612e5ba5c6d03f15b6c63636a81848e6bf2d6

Former-commit-id: 953af90f107b30c6f864e974f44581ae2d8cf8bc

    • binary
    ./SegmentPointReader/invalidSegmentPoint.soil
    • binary
    ./SegmentPointReader/missingStochasticSoilModel.soil
    • binary
    ./SegmentPointReader/skippedStochasticSoilModel.soil
  1. … 4 more files in changeset.