Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTISerializer.cs =================================================================== diff -u -r1972 -r1998 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTISerializer.cs (.../WTISerializer.cs) (revision 1972) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTISerializer.cs (.../WTISerializer.cs) (revision 1998) @@ -78,9 +78,9 @@ } /// - /// Serializes an stability model validation to an xml string obeying WTIStabilityModelValidation.xsd + /// Serializes a stability model validation to an xml string obeying WTIStabilityModelValidation.xsd /// - /// The stability model results + /// The validation results /// The xml string public static string SerializeValidation(IValidationResult[] validationResults) { Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIStabilityModelResult.xsd'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIWaternet.xsd'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIStabilityModel.xsd'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r1993 -r1998 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1993) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1998) @@ -80,15 +80,9 @@ False ..\..\lib\FailureMechanisms\Macrostability\Deltares.WTIStability.Data.dll - - False - ..\..\lib\log4net.2.0.3\log4net.dll - - - @@ -237,31 +231,31 @@ Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIWaternetDefinition.xsd'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIWaternetUsedDuringCalculation.xsd'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WtiVersionInfo.xsd'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIDeserializer.cs =================================================================== diff -u -r1985 -r1998 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIDeserializer.cs (.../WTIDeserializer.cs) (revision 1985) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIDeserializer.cs (.../WTIDeserializer.cs) (revision 1998) @@ -52,12 +52,12 @@ { XmlDocument document = new XmlDocument(); document.LoadXml(xml); - document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WtiVersionInfo.xsd", false)); - document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTIGeometry.xsd", false)); - document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTIWaternetDefinition.xsd", false)); - document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTIWaternet.xsd", false)); - document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTISoilModel.xsd", false)); - document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTIStabilityModel.xsd", true)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.Xsd.WtiVersionInfo.xsd", false)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.Xsd.WTIGeometry.xsd", false)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.Xsd.WTIWaternetDefinition.xsd", false)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.Xsd.WTIWaternet.xsd", false)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.Xsd.WTISoilModel.xsd", false)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.Xsd.WTIStabilityModel.xsd", true)); // the following call to Validate succeeds. document.Validate(ValidationEventHandler); @@ -73,7 +73,7 @@ } /// - /// Deserializes the result. + /// Deserializes the result of the calculation. /// /// The XML. /// The deserialized calculation results. @@ -100,10 +100,10 @@ } /// - /// Deserializes the results of a calculation from the xml string. + /// Deserializes the results of a validation from the xml string. /// /// The XML. - /// The results of the calculation + /// The results of the validation public static ValidationResult[] DeserializeValidation(string xml) { XmlDocument document = new XmlDocument(); Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTISoilModel.xsd'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIGeometry.xsd'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1998 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIStabilityModelValidation.xsd'. Fisheye: No comparison available. Pass `N' to diff?