Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -147,9 +147,6 @@
RingtoetsEntities.tt
-
- RingtoetsEntities.tt
-
RingtoetsEntities.tt
@@ -241,7 +238,6 @@
-
@@ -283,7 +279,6 @@
-
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs
===================================================================
diff -u -rc2bf0666539fa1a781c6d5d633ac292fa4fe2bd4 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision c2bf0666539fa1a781c6d5d633ac292fa4fe2bd4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -58,7 +58,7 @@
if (calculation.HasOutput)
{
- entity.GrassCoverErosionInwardsOutputEntity = calculation.Output.Create(registry);
+ entity.GrassCoverErosionInwardsOutputEntities.Add(calculation.Output.Create(registry));
}
registry.Register(entity, calculation);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -49,11 +49,15 @@
var entity = new GrassCoverErosionInwardsOutputEntity
{
- ProbabilisticOutputEntity = output.ProbabilityAssessmentOutput.Create(registry),
DikeHeight = output.DikeHeight.Value.ToNaNAsNull(),
IsDikeHeightCalculated = Convert.ToByte(output.DikeHeightCalculated),
IsOvertoppingDominant = Convert.ToByte(output.IsOvertoppingDominant),
- WaveHeight = output.WaveHeight.Value.ToNaNAsNull()
+ WaveHeight = output.WaveHeight.Value.ToNaNAsNull(),
+ RequiredProbability = output.ProbabilityAssessmentOutput.RequiredProbability.ToNaNAsNull(),
+ RequiredReliability = output.ProbabilityAssessmentOutput.RequiredReliability.Value.ToNaNAsNull(),
+ Probability = output.ProbabilityAssessmentOutput.Probability.ToNaNAsNull(),
+ Reliability = output.ProbabilityAssessmentOutput.Reliability.Value.ToNaNAsNull(),
+ FactorOfSafety = output.ProbabilityAssessmentOutput.FactorOfSafety.Value.ToNaNAsNull()
};
return entity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -92,15 +92,15 @@
{
if (output != null)
{
- entity.PipingCalculationOutputEntity = output.Create(registry);
+ entity.PipingCalculationOutputEntities.Add(output.Create(registry));
}
}
private static void CreatePipingSemiProbabilisticOutputEntity(PipingCalculationEntity entity, PipingSemiProbabilisticOutput output, PersistenceRegistry registry)
{
if (output != null)
{
- entity.PipingSemiProbabilisticOutputEntity = output.Create(registry);
+ entity.PipingSemiProbabilisticOutputEntities.Add(output.Create(registry));
}
}
}
Fisheye: Tag fa2d88ba58e524c1d132a21df4e0adf9fa6570c4 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilityAssessmentOutputCreateExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 15-sep-2016 15:50:24 */
+/* Created On : 16-Sep-2016 11:31:22 AM */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -42,10 +42,10 @@
DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
;
-DROP TABLE IF EXISTS 'SoilProfileEntity'
+DROP TABLE IF EXISTS 'SoilLayerEntity'
;
-DROP TABLE IF EXISTS 'SoilLayerEntity'
+DROP TABLE IF EXISTS 'SoilProfileEntity'
;
DROP TABLE IF EXISTS 'StochasticSoilProfileEntity'
@@ -63,9 +63,6 @@
DROP TABLE IF EXISTS 'PipingCalculationOutputEntity'
;
-DROP TABLE IF EXISTS 'ProbabilisticOutputEntity'
-;
-
DROP TABLE IF EXISTS 'PipingSemiProbabilisticOutputEntity'
;
@@ -242,8 +239,6 @@
'SurfaceLineEntityId' INTEGER,
'StochasticSoilProfileEntityId' INTEGER,
'HydraulicLocationEntityId' INTEGER,
- 'PipingCalculationOutputEntityId' INTEGER,
- 'PipingSemiProbabilisticOutputEntityId' INTEGER,
'Order' INT (4) NOT NULL,
'Name' VARCHAR (260),
'Comments' TEXT,
@@ -257,8 +252,6 @@
'ScenarioContribution' REAL,
CONSTRAINT 'FK_PipingCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE No Action ON UPDATE No Action,
CONSTRAINT 'FK_PipingCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE No Action ON UPDATE No Action,
- CONSTRAINT 'FK_PipingCalculationEntity_PipingCalculationOutputEntity' FOREIGN KEY ('PipingCalculationOutputEntityId') REFERENCES 'PipingCalculationOutputEntity' ('PipingCalculationOutputEntityId') ON DELETE Cascade ON UPDATE Cascade,
- CONSTRAINT 'FK_PipingCalculationEntity_PipingSemiProbabilisticOutputEntity' FOREIGN KEY ('PipingSemiProbabilisticOutputEntityId') REFERENCES 'PipingSemiProbabilisticOutputEntity' ('PipingSemiProbabilisticOutputEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_PipingCalculationEntity_StochasticSoilProfileEntity' FOREIGN KEY ('StochasticSoilProfileEntityId') REFERENCES 'StochasticSoilProfileEntity' ('StochasticSoilProfileEntityId') ON DELETE No Action ON UPDATE No Action,
CONSTRAINT 'FK_PipingCalculationEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE No Action ON UPDATE No Action
)
@@ -279,7 +272,6 @@
'CalculationGroupEntityId' INTEGER NOT NULL,
'HydraulicLocationEntityId' INTEGER,
'DikeProfileEntityId' INTEGER,
- 'GrassCoverErosionInwardsOutputEntityId' INTEGER,
'Order' INT (4) NOT NULL,
'Name' VARCHAR (260),
'Comments' TEXT,
@@ -294,7 +286,6 @@
'CalculateDikeHeight' TINYINT (1) NOT NULL,
CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_DikeProfileEntity' FOREIGN KEY ('DikeProfileEntityId') REFERENCES 'DikeProfileEntity' ('DikeProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
- CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_GrassCoverErosionInwardsOutputEntity' FOREIGN KEY ('GrassCoverErosionInwardsOutputEntityId') REFERENCES 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsOutputEntityId') ON DELETE Set Null ON UPDATE Cascade,
CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade
)
;
@@ -308,14 +299,6 @@
)
;
-CREATE TABLE 'SoilProfileEntity'
-(
- 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'Bottom' REAL,
- 'Name' TEXT
-)
-;
-
CREATE TABLE 'SoilLayerEntity'
(
'SoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -336,6 +319,14 @@
)
;
+CREATE TABLE 'SoilProfileEntity'
+(
+ 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'Bottom' REAL,
+ 'Name' TEXT
+)
+;
+
CREATE TABLE 'StochasticSoilProfileEntity'
(
'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -388,29 +379,22 @@
CREATE TABLE 'PipingCalculationOutputEntity'
(
'PipingCalculationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'PipingCalculationEntityId' INTEGER NOT NULL,
'HeaveFactorOfSafety' REAL,
'HeaveZValue' REAL,
'UpliftFactorOfSafety' REAL,
'UpliftZValue' REAL,
'SellmeijerFactorOfSafety' REAL,
- 'SellmeijerZValue' REAL
+ 'SellmeijerZValue' REAL,
+ CONSTRAINT 'FK_PipingCalculationOutputEntity_PipingCalculationEntity' FOREIGN KEY ('PipingCalculationEntityId') REFERENCES 'PipingCalculationEntity' ('PipingCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'U_PipingCalculationEntity' UNIQUE ('PipingCalculationEntityId')
)
;
-CREATE TABLE 'ProbabilisticOutputEntity'
-(
- 'ProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'RequiredProbability' REAL,
- 'RequiredReliability' REAL,
- 'Probability' REAL,
- 'Reliability' REAL,
- 'FactorOfSafety' REAL
-)
-;
-
CREATE TABLE 'PipingSemiProbabilisticOutputEntity'
(
'PipingSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'PipingCalculationEntityId' INTEGER NOT NULL,
'UpliftFactorOfSafety' REAL,
'UpliftProbability' REAL,
'HeaveFactorOfSafety' REAL,
@@ -423,7 +407,9 @@
'RequiredReliability' REAL,
'PipingProbability' REAL,
'PipingReliability' REAL,
- 'PipingFactorOfSafety' REAL
+ 'PipingFactorOfSafety' REAL,
+ CONSTRAINT 'FK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity' FOREIGN KEY ('PipingCalculationEntityId') REFERENCES 'PipingCalculationEntity' ('PipingCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'U_PipingCalculationEntity' UNIQUE ('PipingCalculationEntityId')
)
;
@@ -505,7 +491,7 @@
'GrassCoverErosionOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'LayerOne' TINYINT (1) NOT NULL, -- true or false
- 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Succesful
+ 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful
'LayerThree' REAL,
CONSTRAINT 'FK_GrassCoverErosionOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -516,7 +502,7 @@
'GrassCoverSlipOffInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'LayerOne' TINYINT (1) NOT NULL, -- true or false
- 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Succesful
+ 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful
'LayerThree' REAL,
CONSTRAINT 'FK_GrassCoverSlipOffInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -527,7 +513,7 @@
'GrassCoverSlipOffOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'LayerOne' TINYINT (1) NOT NULL, -- true or false
- 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Succesful
+ 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful
'LayerThree' REAL,
CONSTRAINT 'FK_GrassCoverSlipOffOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -571,7 +557,7 @@
'MicrostabilitySectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'LayerOne' TINYINT (1) NOT NULL, -- true or false
- 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Succesful
+ 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful
'LayerThree' REAL,
CONSTRAINT 'FK_MicrostabilitySectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -582,7 +568,7 @@
'PipingStructureSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'LayerOne' TINYINT (1) NOT NULL, -- true or false
- 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Succesful
+ 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful
'LayerThree' REAL,
CONSTRAINT 'FK_PipingStructureSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -592,7 +578,7 @@
(
'DuneErosionSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Succesful
+ 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful
'LayerThree' REAL,
CONSTRAINT 'FK_DuneErosionSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -602,7 +588,7 @@
(
'StabilityStoneCoverSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Succesful
+ 'LayerTwoA' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated 2 = Failed 3 = Successful
'LayerThree' REAL,
CONSTRAINT 'FK_StabilityStoneCoverSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -640,12 +626,18 @@
CREATE TABLE 'GrassCoverErosionInwardsOutputEntity'
(
'GrassCoverErosionInwardsOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'ProbabilisticOutputEntityId' INTEGER NOT NULL,
+ 'GrassCoverErosionInwardsCalculationEntityId' INTEGER NOT NULL,
'IsOvertoppingDominant' TINYINT (1) NOT NULL,
'WaveHeight' REAL,
'DikeHeight' REAL, -- REAL mapped as string, or DBNull when the value is null.
'IsDikeHeightCalculated' TINYINT (1) NOT NULL,
- CONSTRAINT 'FK_GrassCoverErosionInwardsOutput_ProbabilisticOutputEntity' FOREIGN KEY ('ProbabilisticOutputEntityId') REFERENCES 'ProbabilisticOutputEntity' ('ProbabilisticOutputEntityId') ON DELETE Cascade ON UPDATE Cascade
+ 'RequiredProbability' REAL,
+ 'RequiredReliability' REAL,
+ 'Probability' REAL,
+ 'Reliability' REAL,
+ 'FactorOfSafety' REAL,
+ CONSTRAINT 'FK_GrassCoverErosionInwardsOutputEntity_GrassCoverErosionInwardsCalculationEntity' FOREIGN KEY ('GrassCoverErosionInwardsCalculationEntityId') REFERENCES 'GrassCoverErosionInwardsCalculationEntity' ('GrassCoverErosionInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'U_GrassCoverErosionInwardsCalculationEntity' UNIQUE ('GrassCoverErosionInwardsCalculationEntityId')
)
;
@@ -672,7 +664,6 @@
'CalculationGroupEntityId' INTEGER NOT NULL,
'ForeshoreProfileEntityId' INTEGER,
'HydraulicLocationEntityId' INTEGER,
- 'StabilityStoneCoverWaveConditionsOutputEntityId' INTEGER,
'Order' INT (4) NOT NULL,
'Name' VARCHAR (260),
'Comments' TEXT,
@@ -688,18 +679,20 @@
'StepSize' TINYINT (1) NOT NULL, -- 0.5, 1.0 or 2.0
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE No Action ON UPDATE No Action,
CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE No Action ON UPDATE No Action,
- CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE No Action ON UPDATE No Action,
- CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_StabilityStoneCoverWaveConditionsOutputEntity' FOREIGN KEY ('StabilityStoneCoverWaveConditionsOutputEntityId') REFERENCES 'StabilityStoneCoverWaveConditionsOutputEntity' ('StabilityStoneCoverWaveConditionsOutputEntityId') ON DELETE No Action ON UPDATE No Action
+ CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE No Action ON UPDATE No Action
)
;
CREATE TABLE 'StabilityStoneCoverWaveConditionsOutputEntity'
(
'StabilityStoneCoverWaveConditionsOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'StabilityStoneCoverWaveConditionsCalculationEntityId' INTEGER NOT NULL,
'WaterLevel' REAL,
'WaveHeight' REAL,
'WavePeakPeriod' REAL,
- 'WaveAngle' REAL
+ 'WaveAngle' REAL,
+ CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsOutputEntity_StabilityStoneCoverWaveConditionsCalculationEntity' FOREIGN KEY ('StabilityStoneCoverWaveConditionsCalculationEntityId') REFERENCES 'StabilityStoneCoverWaveConditionsCalculationEntity' ('StabilityStoneCoverWaveConditionsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'U_StabilityStoneCoverWaveConditionsCalculationEntity' UNIQUE ('StabilityStoneCoverWaveConditionsCalculationEntityId')
)
;
@@ -733,14 +726,6 @@
ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
;
-CREATE INDEX 'IXFK_PipingCalculationEntity_PipingCalculationOutputEntity'
- ON 'PipingCalculationEntity' ('PipingCalculationOutputEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_PipingCalculationEntity_PipingSemiProbabilisticOutputEntity'
- ON 'PipingCalculationEntity' ('PipingSemiProbabilisticOutputEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_PipingCalculationEntity_StochasticSoilProfileEntity'
ON 'PipingCalculationEntity' ('StochasticSoilProfileEntityId' ASC)
;
@@ -769,10 +754,6 @@
ON 'GrassCoverErosionInwardsCalculationEntity' ('DikeProfileEntityId' ASC)
;
-CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_GrassCoverErosionInwardsOutputEntity'
- ON 'GrassCoverErosionInwardsCalculationEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_HydraulicLocationEntity'
ON 'GrassCoverErosionInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC)
;
@@ -801,6 +782,14 @@
ON 'CharacteristicPointEntity' ('SurfaceLineEntityId' ASC)
;
+CREATE INDEX 'IXFK_PipingCalculationOutputEntity_PipingCalculationEntity'
+ ON 'PipingCalculationOutputEntity' ('PipingCalculationEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity'
+ ON 'PipingSemiProbabilisticOutputEntity' ('PipingCalculationEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_PipingSectionResultEntity_FailureMechanismSectionEntity'
ON 'PipingSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
@@ -881,8 +870,8 @@
ON 'DikeProfileEntity' ('FailureMechanismEntityId' ASC)
;
-CREATE INDEX 'IXFK_GrassCoverErosionInwardsOutput_ProbabilisticOutputEntity'
- ON 'GrassCoverErosionInwardsOutputEntity' ('ProbabilisticOutputEntityId' ASC)
+CREATE INDEX 'IXFK_GrassCoverErosionInwardsOutputEntity_GrassCoverErosionInwardsCalculationEntity'
+ ON 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsCalculationEntityId' ASC)
;
CREATE INDEX 'IXFK_ForeshoreProfileEntity_FailureMechanismEntity'
@@ -901,6 +890,6 @@
ON 'StabilityStoneCoverWaveConditionsCalculationEntity' ('HydraulicLocationEntityId' ASC)
;
-CREATE INDEX 'IXFK_StabilityStoneCoverWaveConditionsCalculationEntity_StabilityStoneCoverWaveConditionsOutputEntity'
- ON 'StabilityStoneCoverWaveConditionsCalculationEntity' ('StabilityStoneCoverWaveConditionsOutputEntityId' ASC)
+CREATE INDEX 'IXFK_StabilityStoneCoverWaveConditionsOutputEntity_StabilityStoneCoverWaveConditionsCalculationEntity'
+ ON 'StabilityStoneCoverWaveConditionsOutputEntity' ('StabilityStoneCoverWaveConditionsCalculationEntityId' ASC)
;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs
===================================================================
diff -u -r1e9309149f9387c4e8b10f6c5f429797220b0ef8 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 1e9309149f9387c4e8b10f6c5f429797220b0ef8)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -38,14 +38,14 @@
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
public GrassCoverErosionInwardsCalculationEntity()
{
+ this.GrassCoverErosionInwardsOutputEntities = new HashSet();
this.GrassCoverErosionInwardsSectionResultEntities = new HashSet();
}
public long GrassCoverErosionInwardsCalculationEntityId { get; set; }
public long CalculationGroupEntityId { get; set; }
public Nullable HydraulicLocationEntityId { get; set; }
public Nullable DikeProfileEntityId { get; set; }
- public Nullable GrassCoverErosionInwardsOutputEntityId { get; set; }
public int Order { get; set; }
public string Name { get; set; }
public string Comments { get; set; }
@@ -62,8 +62,9 @@
public virtual CalculationGroupEntity CalculationGroupEntity { get; set; }
public virtual DikeProfileEntity DikeProfileEntity { get; set; }
public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; }
- public virtual GrassCoverErosionInwardsOutputEntity GrassCoverErosionInwardsOutputEntity { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection GrassCoverErosionInwardsOutputEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs
===================================================================
diff -u -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -35,21 +35,18 @@
public partial class GrassCoverErosionInwardsOutputEntity
{
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
- public GrassCoverErosionInwardsOutputEntity()
- {
- this.GrassCoverErosionInwardsCalculationEntities = new HashSet();
- }
-
public long GrassCoverErosionInwardsOutputEntityId { get; set; }
- public long ProbabilisticOutputEntityId { get; set; }
+ public long GrassCoverErosionInwardsCalculationEntityId { get; set; }
public byte IsOvertoppingDominant { get; set; }
public Nullable WaveHeight { get; set; }
public Nullable DikeHeight { get; set; }
public byte IsDikeHeightCalculated { get; set; }
+ public Nullable RequiredProbability { get; set; }
+ public Nullable RequiredReliability { get; set; }
+ public Nullable Probability { get; set; }
+ public Nullable Reliability { get; set; }
+ public Nullable FactorOfSafety { get; set; }
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; }
- public virtual ProbabilisticOutputEntity ProbabilisticOutputEntity { get; set; }
+ public virtual GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -264,12 +264,6 @@
///
DbSet CharacteristicPointEntities { get; }
- ///
- /// Gets a of
- /// containing every characteristic point of piping surface lines in the database.
- ///
- DbSet ProbabilisticOutputEntities { get; }
-
///
/// Persists all updates to the database and resets change tracking in the object context, see .
///
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs
===================================================================
diff -u -r741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision 741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -35,13 +35,18 @@
public partial class PipingCalculationEntity
{
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+ public PipingCalculationEntity()
+ {
+ this.PipingCalculationOutputEntities = new HashSet();
+ this.PipingSemiProbabilisticOutputEntities = new HashSet();
+ }
+
public long PipingCalculationEntityId { get; set; }
public long CalculationGroupEntityId { get; set; }
public Nullable SurfaceLineEntityId { get; set; }
public Nullable StochasticSoilProfileEntityId { get; set; }
public Nullable HydraulicLocationEntityId { get; set; }
- public Nullable PipingCalculationOutputEntityId { get; set; }
- public Nullable PipingSemiProbabilisticOutputEntityId { get; set; }
public int Order { get; set; }
public string Name { get; set; }
public string Comments { get; set; }
@@ -58,7 +63,9 @@
public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; }
public virtual SurfaceLineEntity SurfaceLineEntity { get; set; }
public virtual StochasticSoilProfileEntity StochasticSoilProfileEntity { get; set; }
- public virtual PipingSemiProbabilisticOutputEntity PipingSemiProbabilisticOutputEntity { get; set; }
- public virtual PipingCalculationOutputEntity PipingCalculationOutputEntity { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection PipingCalculationOutputEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection PipingSemiProbabilisticOutputEntities { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs
===================================================================
diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs (.../PipingCalculationOutputEntity.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs (.../PipingCalculationOutputEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -35,21 +35,15 @@
public partial class PipingCalculationOutputEntity
{
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
- public PipingCalculationOutputEntity()
- {
- this.PipingCalculationEntities = new HashSet();
- }
-
public long PipingCalculationOutputEntityId { get; set; }
+ public long PipingCalculationEntityId { get; set; }
public Nullable HeaveFactorOfSafety { get; set; }
public Nullable HeaveZValue { get; set; }
public Nullable UpliftFactorOfSafety { get; set; }
public Nullable UpliftZValue { get; set; }
public Nullable SellmeijerFactorOfSafety { get; set; }
public Nullable SellmeijerZValue { get; set; }
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection PipingCalculationEntities { get; set; }
+ public virtual PipingCalculationEntity PipingCalculationEntity { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs
===================================================================
diff -u -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -35,13 +35,8 @@
public partial class PipingSemiProbabilisticOutputEntity
{
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
- public PipingSemiProbabilisticOutputEntity()
- {
- this.PipingCalculationEntities = new HashSet();
- }
-
public long PipingSemiProbabilisticOutputEntityId { get; set; }
+ public long PipingCalculationEntityId { get; set; }
public Nullable UpliftFactorOfSafety { get; set; }
public Nullable UpliftProbability { get; set; }
public Nullable HeaveFactorOfSafety { get; set; }
@@ -56,7 +51,6 @@
public Nullable PipingReliability { get; set; }
public Nullable PipingFactorOfSafety { get; set; }
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection PipingCalculationEntities { get; set; }
+ public virtual PipingCalculationEntity PipingCalculationEntity { get; set; }
}
}
Fisheye: Tag fa2d88ba58e524c1d132a21df4e0adf9fa6570c4 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProbabilisticOutputEntity.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -80,7 +80,6 @@
public virtual DbSet PipingSectionResultEntities { get; set; }
public virtual DbSet PipingSemiProbabilisticOutputEntities { get; set; }
public virtual DbSet PipingStructureSectionResultEntities { get; set; }
- public virtual DbSet ProbabilisticOutputEntities { get; set; }
public virtual DbSet ProjectEntities { get; set; }
public virtual DbSet SoilLayerEntities { get; set; }
public virtual DbSet SoilProfileEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -4,7 +4,7 @@
-
+
@@ -123,7 +123,6 @@
-
@@ -150,11 +149,16 @@
-
+
+
+
+
+
+
@@ -268,8 +272,6 @@
-
-
@@ -287,6 +289,7 @@
+
@@ -317,6 +320,7 @@
+
@@ -341,17 +345,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -403,7 +396,6 @@
-
@@ -423,6 +415,7 @@
+
@@ -649,18 +642,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -672,7 +653,7 @@
-
+
@@ -697,14 +678,14 @@
-
+
-
-
+
+
-
+
@@ -865,30 +846,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -900,7 +857,7 @@
-
+
@@ -912,6 +869,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -936,6 +905,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -973,18 +954,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -996,7 +965,7 @@
-
+
@@ -1008,7 +977,7 @@
-
+
@@ -1020,6 +989,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1157,7 +1138,6 @@
-
@@ -1218,14 +1198,10 @@
-
-
-
-
-
+
@@ -1234,7 +1210,7 @@
-
+
@@ -1290,21 +1266,17 @@
-
+
-
+
-
-
+
+
-
-
-
-
@@ -1313,6 +1285,10 @@
+
+
+
+
@@ -1326,20 +1302,20 @@
-
+
-
+
-
+
-
-
+
+
@@ -1411,7 +1387,6 @@
-
@@ -1447,15 +1422,15 @@
-
+
-
+
-
+
@@ -1471,7 +1446,7 @@
-
+
@@ -1571,31 +1546,27 @@
-
+
-
-
+
+
-
-
-
-
-
+
-
+
@@ -1607,13 +1578,13 @@
-
-
+
-
-
+
+
+
@@ -1623,9 +1594,9 @@
-
-
+
+
@@ -1663,9 +1634,9 @@
-
-
-
+
+
+
@@ -1708,7 +1679,7 @@
-
+
@@ -1785,7 +1756,7 @@
-
+
@@ -1795,7 +1766,6 @@
-
@@ -1808,10 +1778,10 @@
-
-
+
+
-
+
@@ -1828,13 +1798,17 @@
-
+
-
-
+
+
+
+
+
+
@@ -1917,8 +1891,8 @@
-
-
+
+
@@ -1962,8 +1936,6 @@
-
-
@@ -1975,25 +1947,26 @@
-
-
+
+
-
-
+
+
+
-
+
@@ -2020,6 +1993,7 @@
+
@@ -2033,7 +2007,7 @@
-
+
@@ -2046,18 +2020,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2114,7 +2076,6 @@
-
@@ -2128,21 +2089,22 @@
-
-
-
-
+
+
+
+
+
-
+
@@ -2305,7 +2267,7 @@
-
+
@@ -2317,7 +2279,7 @@
-
+
@@ -2329,7 +2291,7 @@
-
+
@@ -2377,7 +2339,7 @@
-
+
@@ -2677,7 +2639,7 @@
-
+
@@ -2701,15 +2663,15 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -2725,19 +2687,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2749,7 +2699,7 @@
-
+
@@ -2785,27 +2735,27 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -2833,15 +2783,15 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -2997,7 +2947,6 @@
-
@@ -3017,11 +2966,16 @@
+
+
+
+
+
-
+
@@ -3153,8 +3107,6 @@
-
-
@@ -3172,6 +3124,7 @@
+
@@ -3212,6 +3165,7 @@
+
@@ -3227,18 +3181,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3302,7 +3244,6 @@
-
@@ -3317,6 +3258,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -5,62 +5,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
@@ -85,20 +84,19 @@
-
+
-
-
-
-
+
+
+
-
-
+
+
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -35,11 +35,16 @@
public partial class StabilityStoneCoverWaveConditionsCalculationEntity
{
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+ public StabilityStoneCoverWaveConditionsCalculationEntity()
+ {
+ this.StabilityStoneCoverWaveConditionsOutputEntities = new HashSet();
+ }
+
public long StabilityStoneCoverWaveConditionsCalculationEntityId { get; set; }
public long CalculationGroupEntityId { get; set; }
public Nullable ForeshoreProfileEntityId { get; set; }
public Nullable HydraulicLocationEntityId { get; set; }
- public Nullable StabilityStoneCoverWaveConditionsOutputEntityId { get; set; }
public int Order { get; set; }
public string Name { get; set; }
public string Comments { get; set; }
@@ -57,6 +62,7 @@
public virtual CalculationGroupEntity CalculationGroupEntity { get; set; }
public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; }
public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; }
- public virtual StabilityStoneCoverWaveConditionsOutputEntity StabilityStoneCoverWaveConditionsOutputEntity { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection StabilityStoneCoverWaveConditionsOutputEntities { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -35,19 +35,13 @@
public partial class StabilityStoneCoverWaveConditionsOutputEntity
{
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
- public StabilityStoneCoverWaveConditionsOutputEntity()
- {
- this.StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet();
- }
-
public long StabilityStoneCoverWaveConditionsOutputEntityId { get; set; }
+ public long StabilityStoneCoverWaveConditionsCalculationEntityId { get; set; }
public Nullable WaterLevel { get; set; }
public Nullable WaveHeight { get; set; }
public Nullable WavePeakPeriod { get; set; }
public Nullable WaveAngle { get; set; }
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; }
+ public virtual StabilityStoneCoverWaveConditionsCalculationEntity StabilityStoneCoverWaveConditionsCalculationEntity { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Linq;
using Application.Ringtoets.Storage.DbContext;
using Core.Common.Base.Data;
using Ringtoets.Common.Data.DikeProfiles;
@@ -79,9 +80,10 @@
}
};
- if (entity.GrassCoverErosionInwardsOutputEntity != null)
+ GrassCoverErosionInwardsOutputEntity output = entity.GrassCoverErosionInwardsOutputEntities.FirstOrDefault();
+ if (output != null)
{
- calculation.Output = entity.GrassCoverErosionInwardsOutputEntity.Read();
+ calculation.Output = output.Read();
}
collector.Read(entity, calculation);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -21,6 +21,7 @@
using System;
using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.Common.Data.Probability;
using Ringtoets.GrassCoverErosionInwards.Data;
namespace Application.Ringtoets.Storage.Read.GrassCoverErosionInwards
@@ -42,10 +43,19 @@
{
return new GrassCoverErosionInwardsOutput(entity.WaveHeight.ToNullAsNaN(),
Convert.ToBoolean(entity.IsOvertoppingDominant),
- entity.ProbabilisticOutputEntity.Read(),
+ ReadProbabilityAssessmentOutput(entity),
GetDikeHeightValue(entity));
}
+ private static ProbabilityAssessmentOutput ReadProbabilityAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity)
+ {
+ return new ProbabilityAssessmentOutput(entity.RequiredProbability.ToNullAsNaN(),
+ entity.RequiredReliability.ToNullAsNaN(),
+ entity.Probability.ToNullAsNaN(),
+ entity.Reliability.ToNullAsNaN(),
+ entity.FactorOfSafety.ToNullAsNaN());
+ }
+
private static double? GetDikeHeightValue(GrassCoverErosionInwardsOutputEntity entity)
{
if (Convert.ToBoolean(entity.IsDikeHeightCalculated))
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Linq;
using Application.Ringtoets.Storage.DbContext;
using Core.Common.Base.Data;
using Ringtoets.Integration.Data;
@@ -63,14 +64,16 @@
private static void ReadCalculationOutputs(PipingCalculationScenario calculation, PipingCalculationEntity entity)
{
- if (entity.PipingCalculationOutputEntity != null)
+ PipingCalculationOutputEntity calculationOutputEntity = entity.PipingCalculationOutputEntities.FirstOrDefault();
+ if (calculationOutputEntity != null)
{
- calculation.Output = entity.PipingCalculationOutputEntity.Read();
+ calculation.Output = calculationOutputEntity.Read();
}
- if (entity.PipingSemiProbabilisticOutputEntity != null)
+ PipingSemiProbabilisticOutputEntity semiProbabilisticOutputEntity = entity.PipingSemiProbabilisticOutputEntities.FirstOrDefault();
+ if (semiProbabilisticOutputEntity != null)
{
- calculation.SemiProbabilisticOutput = entity.PipingSemiProbabilisticOutputEntity.Read();
+ calculation.SemiProbabilisticOutput = semiProbabilisticOutputEntity.Read();
}
}
Fisheye: Tag fa2d88ba58e524c1d132a21df4e0adf9fa6570c4 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ProbabilisticOutputEntityReadExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -124,7 +124,6 @@
-
@@ -165,7 +164,6 @@
-
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Linq;
using Application.Ringtoets.Storage.Create;
using Application.Ringtoets.Storage.Create.GrassCoverErosionInwards;
using Application.Ringtoets.Storage.DbContext;
@@ -107,7 +108,7 @@
Assert.AreEqual(input.DikeHeight.Value, entity.DikeHeight);
Assert.AreEqual(Convert.ToByte(input.UseForeshore), entity.UseForeshore);
- Assert.IsNull(entity.GrassCoverErosionInwardsOutputEntity);
+ Assert.IsFalse(entity.GrassCoverErosionInwardsOutputEntities.Any());
}
[Test]
@@ -235,7 +236,7 @@
GrassCoverErosionInwardsCalculationEntity entity = calculation.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity.GrassCoverErosionInwardsOutputEntity);
+ Assert.AreEqual(1, entity.GrassCoverErosionInwardsOutputEntities.Count);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -65,11 +65,11 @@
Assert.AreEqual(output.WaveHeight.Value, entity.WaveHeight);
Assert.AreEqual(Convert.ToByte(output.IsOvertoppingDominant), entity.IsOvertoppingDominant);
- Assert.AreEqual(probabilityAssessmentOutput.FactorOfSafety.Value, entity.ProbabilisticOutputEntity.FactorOfSafety);
- Assert.AreEqual(probabilityAssessmentOutput.Probability, entity.ProbabilisticOutputEntity.Probability);
- Assert.AreEqual(probabilityAssessmentOutput.Reliability.Value, entity.ProbabilisticOutputEntity.Reliability);
- Assert.AreEqual(probabilityAssessmentOutput.RequiredProbability, entity.ProbabilisticOutputEntity.RequiredProbability);
- Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability.Value, entity.ProbabilisticOutputEntity.RequiredReliability);
+ Assert.AreEqual(probabilityAssessmentOutput.FactorOfSafety.Value, entity.FactorOfSafety);
+ Assert.AreEqual(probabilityAssessmentOutput.Probability, entity.Probability);
+ Assert.AreEqual(probabilityAssessmentOutput.Reliability.Value, entity.Reliability);
+ Assert.AreEqual(probabilityAssessmentOutput.RequiredProbability, entity.RequiredProbability);
+ Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability.Value, entity.RequiredReliability);
}
[Test]
@@ -89,11 +89,11 @@
Assert.IsNull(entity.WaveHeight);
Assert.AreEqual(Convert.ToByte(output.IsOvertoppingDominant), entity.IsOvertoppingDominant);
Assert.AreEqual(Convert.ToByte(true), entity.IsDikeHeightCalculated);
- Assert.IsNull(entity.ProbabilisticOutputEntity.FactorOfSafety);
- Assert.IsNull(entity.ProbabilisticOutputEntity.Probability);
- Assert.IsNull(entity.ProbabilisticOutputEntity.Reliability);
- Assert.IsNull(entity.ProbabilisticOutputEntity.RequiredProbability);
- Assert.IsNull(entity.ProbabilisticOutputEntity.RequiredReliability);
+ Assert.IsNull(entity.FactorOfSafety);
+ Assert.IsNull(entity.Probability);
+ Assert.IsNull(entity.Reliability);
+ Assert.IsNull(entity.RequiredProbability);
+ Assert.IsNull(entity.RequiredReliability);
}
[Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -262,7 +262,7 @@
PipingCalculationEntity entity = calculation.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity.PipingCalculationOutputEntity);
+ Assert.AreEqual(1, entity.PipingCalculationOutputEntities.Count());
}
[Test]
@@ -285,7 +285,7 @@
PipingCalculationEntity entity = calculation.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity.PipingSemiProbabilisticOutputEntity);
+ Assert.AreEqual(1, entity.PipingSemiProbabilisticOutputEntities.Count);
}
private double GetRandomDoubleFromRange(Random random, double lowerLimit, double upperLimit)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs (.../PipingOutputCreateExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs (.../PipingOutputCreateExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -65,7 +65,7 @@
Assert.AreEqual(pipingOutput.UpliftZValue, entity.UpliftZValue);
Assert.AreEqual(0, entity.PipingCalculationOutputEntityId);
- CollectionAssert.IsEmpty(entity.PipingCalculationEntities);
+ Assert.AreEqual(0, entity.PipingCalculationEntityId);
}
[Test]
@@ -89,7 +89,7 @@
Assert.IsNull(entity.UpliftZValue);
Assert.AreEqual(0, entity.PipingCalculationOutputEntityId);
- CollectionAssert.IsEmpty(entity.PipingCalculationEntities);
+ Assert.AreEqual(0, entity.PipingCalculationEntityId);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs
===================================================================
diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs (.../PipingSemiProbabilisticOutputCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs (.../PipingSemiProbabilisticOutputCreateExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -77,7 +77,7 @@
AssertAreEqual(output.PipingFactorOfSafety, entity.PipingFactorOfSafety);
Assert.AreEqual(0, entity.PipingSemiProbabilisticOutputEntityId);
- CollectionAssert.IsEmpty(entity.PipingCalculationEntities);
+ Assert.AreEqual(0, entity.PipingCalculationEntityId);
}
[Test]
@@ -110,7 +110,7 @@
Assert.IsNull(entity.PipingFactorOfSafety);
Assert.AreEqual(0, entity.PipingSemiProbabilisticOutputEntityId);
- CollectionAssert.IsEmpty(entity.PipingCalculationEntities);
+ Assert.AreEqual(0, entity.PipingCalculationEntityId);
}
private static void AssertAreEqual(double expectedValue, double? actualValue)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilisticAssessmentOutputCreateExtensionsTest.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilisticAssessmentOutputCreateExtensionsTest.cs (.../ProbabilisticAssessmentOutputCreateExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilisticAssessmentOutputCreateExtensionsTest.cs (.../ProbabilisticAssessmentOutputCreateExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -31,20 +31,6 @@
public class ProbabilisticAssessmentOutputCreateExtensionsTest
{
[Test]
- public void Create_PersistenceRegistryNull_ThrowArgumentNullException()
- {
- // Setup
- var output = new ProbabilityAssessmentOutput(1, 1, 1, 1, 1);
-
- // Call
- TestDelegate call = () => output.Create(null);
-
- // AssertL
- string paramName = Assert.Throws(call).ParamName;
- Assert.AreEqual("registry", paramName);
- }
-
- [Test]
public void Create_ValidValues_ReturnProbabilisticOutputEntity()
{
// Setup
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r97018b4e8e9cd81438e8fd0d111d889e20946617 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -59,7 +59,6 @@
{
Name = "sodhfksn",
Comments = "s;ohfgwjo5p09u",
- GrassCoverErosionInwardsOutputEntity = null,
HydraulicLocationEntity = null,
DikeProfileEntity = null,
Orientation = 5.6,
@@ -249,9 +248,9 @@
// Setup
var entity = new GrassCoverErosionInwardsCalculationEntity
{
- GrassCoverErosionInwardsOutputEntity = new GrassCoverErosionInwardsOutputEntity
+ GrassCoverErosionInwardsOutputEntities =
{
- ProbabilisticOutputEntity = new ProbabilisticOutputEntity()
+ new GrassCoverErosionInwardsOutputEntity()
}
};
@@ -270,9 +269,9 @@
// Setup
var entity = new GrassCoverErosionInwardsCalculationEntity
{
- GrassCoverErosionInwardsOutputEntity = new GrassCoverErosionInwardsOutputEntity
+ GrassCoverErosionInwardsOutputEntities =
{
- ProbabilisticOutputEntity = new ProbabilisticOutputEntity()
+ new GrassCoverErosionInwardsOutputEntity()
}
};
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r97018b4e8e9cd81438e8fd0d111d889e20946617 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -34,22 +34,18 @@
public void Read_ValidEntity_ReturnGrassCoverErosionInwardsOutput()
{
// Setup
- var probabilisticOutputEntity = new ProbabilisticOutputEntity
+ var entity = new GrassCoverErosionInwardsOutputEntity
{
+ WaveHeight = 1.1,
+ IsOvertoppingDominant = Convert.ToByte(false),
+ DikeHeight = 3.3,
+ IsDikeHeightCalculated = Convert.ToByte(true),
Probability = 0.7,
RequiredProbability = 0.4,
RequiredReliability = 0.5,
Reliability = 0.2,
FactorOfSafety = 9.5
};
- var entity = new GrassCoverErosionInwardsOutputEntity
- {
- WaveHeight = 1.1,
- IsOvertoppingDominant = Convert.ToByte(false),
- ProbabilisticOutputEntity = probabilisticOutputEntity,
- DikeHeight = 3.3,
- IsDikeHeightCalculated = Convert.ToByte(true)
- };
// Call
GrassCoverErosionInwardsOutput output = entity.Read();
@@ -59,34 +55,29 @@
Assert.IsFalse(output.IsOvertoppingDominant);
Assert.AreEqual(entity.DikeHeight, output.DikeHeight.Value);
Assert.IsTrue(output.DikeHeightCalculated);
-
- Assert.AreEqual(probabilisticOutputEntity.FactorOfSafety, output.ProbabilityAssessmentOutput.FactorOfSafety.Value);
- Assert.AreEqual(probabilisticOutputEntity.Probability, output.ProbabilityAssessmentOutput.Probability);
- Assert.AreEqual(probabilisticOutputEntity.RequiredProbability, output.ProbabilityAssessmentOutput.RequiredProbability);
- Assert.AreEqual(probabilisticOutputEntity.Reliability, output.ProbabilityAssessmentOutput.Reliability.Value);
- Assert.AreEqual(probabilisticOutputEntity.RequiredReliability, output.ProbabilityAssessmentOutput.RequiredReliability.Value);
+ Assert.AreEqual(entity.FactorOfSafety, output.ProbabilityAssessmentOutput.FactorOfSafety.Value);
+ Assert.AreEqual(entity.Probability, output.ProbabilityAssessmentOutput.Probability);
+ Assert.AreEqual(entity.RequiredProbability, output.ProbabilityAssessmentOutput.RequiredProbability);
+ Assert.AreEqual(entity.Reliability, output.ProbabilityAssessmentOutput.Reliability.Value);
+ Assert.AreEqual(entity.RequiredReliability, output.ProbabilityAssessmentOutput.RequiredReliability.Value);
}
[Test]
public void Read_ValidEntityWithNullValues_ReturnGrassCoverErosionInwardsOutput()
{
// Setup
- var probabilisticOutputEntity = new ProbabilisticOutputEntity
+ var entity = new GrassCoverErosionInwardsOutputEntity
{
+ WaveHeight = null,
+ IsOvertoppingDominant = Convert.ToByte(true),
+ DikeHeight = null,
+ IsDikeHeightCalculated = Convert.ToByte(true),
Probability = null,
RequiredProbability = null,
RequiredReliability = null,
Reliability = null,
FactorOfSafety = null
};
- var entity = new GrassCoverErosionInwardsOutputEntity
- {
- WaveHeight = null,
- IsOvertoppingDominant = Convert.ToByte(true),
- ProbabilisticOutputEntity = probabilisticOutputEntity,
- DikeHeight = null,
- IsDikeHeightCalculated = Convert.ToByte(true)
- };
// Call
GrassCoverErosionInwardsOutput output = entity.Read();
@@ -96,7 +87,6 @@
Assert.IsTrue(output.IsOvertoppingDominant);
Assert.IsNaN(output.DikeHeight);
Assert.IsTrue(output.DikeHeightCalculated);
-
Assert.IsNaN(output.ProbabilityAssessmentOutput.FactorOfSafety.Value);
Assert.IsNaN(output.ProbabilityAssessmentOutput.Probability);
Assert.IsNaN(output.ProbabilityAssessmentOutput.RequiredProbability);
@@ -108,10 +98,8 @@
public void Read_DikeHeightNotCalculated_ReturnGrassCoverErosionInwardsOutputWithNotCalculatedDikeHeight()
{
// Setup
- var probabilisticOutputEntity = new ProbabilisticOutputEntity();
var entity = new GrassCoverErosionInwardsOutputEntity
{
- ProbabilisticOutputEntity = probabilisticOutputEntity,
DikeHeight = null,
IsDikeHeightCalculated = Convert.ToByte(false)
};
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r97018b4e8e9cd81438e8fd0d111d889e20946617 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
@@ -312,7 +312,10 @@
EntryPointL = 1,
ExitPointL = 2,
DampingFactorExitMean = 1,
- PipingCalculationOutputEntity = new PipingCalculationOutputEntity()
+ PipingCalculationOutputEntities =
+ {
+ new PipingCalculationOutputEntity()
+ }
};
var collector = new ReadConversionCollector();
@@ -333,7 +336,13 @@
EntryPointL = 1,
ExitPointL = 2,
DampingFactorExitMean = 1,
- PipingSemiProbabilisticOutputEntity = new PipingSemiProbabilisticOutputEntity()
+ PipingSemiProbabilisticOutputEntities =
+ {
+ new PipingSemiProbabilisticOutputEntity()
+ {
+ HeaveFactorOfSafety = 1.0
+ }
+ }
};
var collector = new ReadConversionCollector();
Fisheye: Tag fa2d88ba58e524c1d132a21df4e0adf9fa6570c4 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProbabilisticOutputEntityReadExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?