Index: dam engine/trunk/src/Deltares.DamEngine.Data/RWScenarios/EvaluationJob.cs
===================================================================
diff -u -r404 -r408
--- dam engine/trunk/src/Deltares.DamEngine.Data/RWScenarios/EvaluationJob.cs (.../EvaluationJob.cs) (revision 404)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/RWScenarios/EvaluationJob.cs (.../EvaluationJob.cs) (revision 408)
@@ -133,13 +133,13 @@
}
}
- if (locationJob.LocationResult.SchematizationFactorsResult != null)
- {
- foreach (var schematizationFactorResult in locationJob.LocationResult.SchematizationFactorsResult.SchematizationFactorResults)
- {
- schematizationFactorResult.Location = locationJob.Location;
- }
- }
+// if (locationJob.LocationResult.SchematizationFactorsResult != null)
+// {
+// foreach (var schematizationFactorResult in locationJob.LocationResult.SchematizationFactorsResult.SchematizationFactorResults)
+// {
+// schematizationFactorResult.Location = locationJob.Location;
+// }
+// } #Bka: if this is really needed, location must be given a setter.
}
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r406 -r408
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 406)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 408)
@@ -2478,7 +2478,7 @@
Piping,
///
- HorizontalBalance,
+ HorizontalBalance
}
///
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/RWSchematizationFactorsResult.cs
===================================================================
diff -u -r404 -r408
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/RWSchematizationFactorsResult.cs (.../RWSchematizationFactorsResult.cs) (revision 404)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/RWSchematizationFactorsResult.cs (.../RWSchematizationFactorsResult.cs) (revision 408)
@@ -48,12 +48,16 @@
private double detrimentFactor;
private double safetyFactor;
- public virtual Location Location // <-- hier verder. gebruik nakijken in Dam new VS12
+ public RWSchematizationFactorResult(Location location)
{
- get { return location; }
- set { location = value; }
+ this.location = location;
}
+ public virtual Location Location
+ {
+ get { return location; }
+ }
+
public string LocationName
{
get { return this.Location != null ? this.Location.Name : ""; }
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/SchematizationFactor/SchematizationFactorCalculation.cs
===================================================================
diff -u -r404 -r408
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/SchematizationFactor/SchematizationFactorCalculation.cs (.../SchematizationFactorCalculation.cs) (revision 404)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/SchematizationFactor/SchematizationFactorCalculation.cs (.../SchematizationFactorCalculation.cs) (revision 408)
@@ -191,10 +191,9 @@
private RWSchematizationFactorResult GetSchematizationFactorResult(SchematizationType schematizationType)
{
- var schematizationFactorResult = new RWSchematizationFactorResult();
+ var schematizationFactorResult = new RWSchematizationFactorResult(Location);
schematizationFactorResult.SchematizationType = schematizationType;
schematizationFactorResult.SchematizationFactor = schematizationFactorData.SchematizationFactorMin;
- schematizationFactorResult.Location = this.Location;
schematizationFactorResult.DetrimentFactor = DetrimentFactor;
var decisiveScenarioResults = GetDecisiveResultsPerSchematizationType(schematizationType);