Fisheye: Tag 956 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityFileParseException.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DAMMstabGeometry2DSectionAssemblerTest.cs =================================================================== diff -u -r877 -r956 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DAMMstabGeometry2DSectionAssemblerTest.cs (.../DAMMstabGeometry2DSectionAssemblerTest.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DAMMstabGeometry2DSectionAssemblerTest.cs (.../DAMMstabGeometry2DSectionAssemblerTest.cs) (revision 956) @@ -39,7 +39,7 @@ private const string testDirectory = "TestResults"; private const string testFileName = "DAMMStabGeometry2DSectionAssemblerTest.xml"; private const double cTolerance = 1e-8; - private DAMMStabGeometry2DSectionAssembler assembler; + private DamMstabGeometry2DSectionAssembler assembler; private Geometry2DSectionParameters geometry2DSectionParameters; //private SoilProfile soilProfile1; #region Setup/Teardown @@ -48,7 +48,7 @@ public void TestSetup() { const string soilGeometry2DName = "SoilGeometry2DName"; - this.assembler = new DAMMStabGeometry2DSectionAssembler(); + this.assembler = new DamMstabGeometry2DSectionAssembler(); this.geometry2DSectionParameters = new Geometry2DSectionParameters(); this.geometry2DSectionParameters.XCoordinateSection = 65.4; this.geometry2DSectionParameters.SoilGeometry2DName = soilGeometry2DName; @@ -132,12 +132,12 @@ // Input XElement inputElement = (from element in doc.Root.Descendants() - where element.Name.LocalName == DAMMStabGeometry2DSectionAssembler.XmlElementGeometry2DSectionInput + where element.Name.LocalName == DamMstabGeometry2DSectionAssembler.XmlElementGeometry2DSectionInput select element).Single(); // Database - Assert.AreEqual(this.geometry2DSectionParameters.SoilGeometry2DName, inputElement.AttributeAs(DAMMStabGeometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename), String.Format("{0}", DAMMStabGeometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename)); - Assert.AreEqual(this.geometry2DSectionParameters.XCoordinateSection, inputElement.AttributeAs(DAMMStabGeometry2DSectionAssembler.XmlAttributeXCoordinateSection), String.Format("{0}", DAMMStabGeometry2DSectionAssembler.XmlAttributeXCoordinateSection)); + Assert.AreEqual(this.geometry2DSectionParameters.SoilGeometry2DName, inputElement.AttributeAs(DamMstabGeometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename), String.Format("{0}", DamMstabGeometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename)); + Assert.AreEqual(this.geometry2DSectionParameters.XCoordinateSection, inputElement.AttributeAs(DamMstabGeometry2DSectionAssembler.XmlAttributeXCoordinateSection), String.Format("{0}", DamMstabGeometry2DSectionAssembler.XmlAttributeXCoordinateSection)); // Profile Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityServiceAgent.cs =================================================================== diff -u -r949 -r956 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityServiceAgent.cs (.../StabilityServiceAgent.cs) (revision 949) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityServiceAgent.cs (.../StabilityServiceAgent.cs) (revision 956) @@ -44,18 +44,18 @@ /// /// Create Soilprofile for location X in geometry-2d /// - /// - /// - public void ConvertGeometry2DTo1D(string inputXML, ref StringBuilder outputXML) + /// + /// + public void ConvertGeometry2DTo1D(string inputXml, out StringBuilder outputXml) { const int defaultBufferSize = 10000; int bufferSize = defaultBufferSize; - outputXML = new StringBuilder(bufferSize); - int returnCode = mstabDamDll.Geometry2DTo1DConversion(inputXML, outputXML, ref bufferSize); + outputXml = new StringBuilder(bufferSize); + int returnCode = mstabDamDll.Geometry2DTo1DConversion(inputXml, outputXml, ref bufferSize); if (returnCode == DgsStandardDllInterface.DllErrorOutputBufferTooSmall) { - outputXML = new StringBuilder(bufferSize); - returnCode = mstabDamDll.Geometry2DTo1DConversion(inputXML, outputXML, ref bufferSize); + outputXml = new StringBuilder(bufferSize); + returnCode = mstabDamDll.Geometry2DTo1DConversion(inputXml, outputXml, ref bufferSize); } if (returnCode != DgsStandardDllInterface.DllErrorNone) throw new StabilityServiceAgentException(mstabDamDll.ErrorMessage()); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DSectionAssembler.cs =================================================================== diff -u -r877 -r956 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DSectionAssembler.cs (.../DAMMStabGeometry2DSectionAssembler.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DAMMStabGeometry2DSectionAssembler.cs (.../DAMMStabGeometry2DSectionAssembler.cs) (revision 956) @@ -31,11 +31,8 @@ /// /// /// - public class DAMMStabGeometry2DSectionAssembler : DtoDocumentAssembler + public class DamMstabGeometry2DSectionAssembler : DtoDocumentAssembler { - #region Constant declarations - - #endregion /// /// Holds the xml element name /// @@ -51,7 +48,7 @@ /// /// /// - public DAMMStabGeometry2DSectionAssembler() : + public DamMstabGeometry2DSectionAssembler() : base(DamMStabAssembler.XmlElementName, DamMStabAssembler.XmlElementNamespace, DamMStabAssembler.XsdEmbeddedResourcePath) { } @@ -60,28 +57,29 @@ { var doc = base.CreateDataTransferObject(geometry2DSectionParameters); XNamespace tns = ElementNamespace; - XNamespace tnsb = XmlElementNameGeometry2DSectionInput; - + // Geometry2DSectionParameters XElement geometry2DSectionElement = GetGeometry2DSectionParametersElement(geometry2DSectionParameters, tns); - doc.Root.Add(geometry2DSectionElement); - - // Profile - var profile = geometry2DSectionParameters.SoilProfile; - if (profile != null) + if (doc.Root != null) { - var soilProfileAssembler = new SoilProfileAssembler(); - XNamespace tnsa = soilProfileAssembler.ElementNamespace; - doc.Root.Add(new XAttribute(XNamespace.Xmlns + "tnsa", tnsa.NamespaceName)); + doc.Root.Add(geometry2DSectionElement); + // Profile + var profile = geometry2DSectionParameters.SoilProfile; + if (profile != null) + { + var soilProfileAssembler = new SoilProfileAssembler(); + XNamespace tnsa = soilProfileAssembler.ElementNamespace; + doc.Root.Add(new XAttribute(XNamespace.Xmlns + "tnsa", tnsa.NamespaceName)); - //TODO: Remove duplicate code. The method GetProfileElement should call the SoilProfileAssembler already defined in another namespace - XElement profileElement = GetProfileElement(profile, tns, tnsa); - // XElement profileElement = soilProfileAssembler.CreateDataTransferObject(profile); //GetProfileElement(profile, tns, tnsa); - // profileElement.Name = tns.GetName(profileElement.Name.LocalName);// .SetNamespace(DamMStabAssembler.XmlElementProfile, tns.NamespaceName); - doc.Root.Add(profileElement); - } + //TODO: Remove duplicate code. The method GetProfileElement should call the SoilProfileAssembler already defined in another namespace + XElement profileElement = GetProfileElement(profile, tns, tnsa); + // XElement profileElement = soilProfileAssembler.CreateDataTransferObject(profile); //GetProfileElement(profile, tns, tnsa); + // profileElement.Name = tns.GetName(profileElement.Name.LocalName);// .SetNamespace(DamMStabAssembler.XmlElementProfile, tns.NamespaceName); + doc.Root.Add(profileElement); + } + } return doc; } @@ -158,12 +156,12 @@ Geometry2DSectionParameters geometry2DSectionParameters = new Geometry2DSectionParameters(); // Get the dto XElement dto = (from x in dtoDocument.Descendants() - where x.Name.LocalName == DAMMStabGeometry2DSectionAssembler.XmlElementGeometry2DSectionInput + where x.Name.LocalName == XmlElementGeometry2DSectionInput select x).FirstOrDefault(); if (dto != null) { - geometry2DSectionParameters.SoilGeometry2DName = dto.AttributeAs(DAMMStabGeometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename); - geometry2DSectionParameters.XCoordinateSection = dto.AttributeAs(DAMMStabGeometry2DSectionAssembler.XmlAttributeXCoordinateSection); + geometry2DSectionParameters.SoilGeometry2DName = dto.AttributeAs(XmlAttributeSoilGeometry2DFilename); + geometry2DSectionParameters.XCoordinateSection = dto.AttributeAs(XmlAttributeXCoordinateSection); } // Get the dto @@ -172,9 +170,11 @@ select x).FirstOrDefault(); if (profileDto != null) { - var soilProfile = new SoilProfile1D(); - soilProfile.Name = profileDto.AttributeAs(DamMStabAssembler.XmlAttributeName); - soilProfile.BottomLevel = profileDto.AttributeAs(DamMStabAssembler.XmlAttributeBottomLevel); + var soilProfile = new SoilProfile1D + { + Name = profileDto.AttributeAs(DamMStabAssembler.XmlAttributeName), + BottomLevel = profileDto.AttributeAs(DamMStabAssembler.XmlAttributeBottomLevel) + }; // Layers XElement layerCollectionElement = (from element in profileDto.Descendants() where element.Name.LocalName == DamMStabAssembler.XmlElementLayers @@ -184,10 +184,12 @@ select element; foreach (XElement layerElement in layerElementCollection) { - var soilLayer = new SoilLayer1D(); - soilLayer.Name = layerElement.AttributeAs("ID"); - soilLayer.SoilName = layerElement.AttributeAs(DamMStabAssembler.XmlAttributeSoilID); - soilLayer.TopLevel = layerElement.AttributeAs(DamMStabAssembler.XmlAttributeTopLevel); + var soilLayer = new SoilLayer1D + { + Name = layerElement.AttributeAs("ID"), + SoilName = layerElement.AttributeAs(DamMStabAssembler.XmlAttributeSoilID), + TopLevel = layerElement.AttributeAs(DamMStabAssembler.XmlAttributeTopLevel) + }; soilProfile.Layers.Add(soilLayer); } geometry2DSectionParameters.SoilProfile = soilProfile; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r949 -r956 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 949) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 956) @@ -134,10 +134,8 @@ - - Fisheye: Tag 956 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityServiceFileParser.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs =================================================================== diff -u -r949 -r956 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs (.../Geometry2DTo1DConverter.cs) (revision 949) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs (.../Geometry2DTo1DConverter.cs) (revision 956) @@ -94,7 +94,7 @@ { //xCoordinate = Math.Min(xCoordinate, this.SurfaceLine[CharacteristicPointType.SurfaceLevelInside].X - 0.1); //xCoordinate = this.SurfaceLine[CharacteristicPointType.SurfaceLevelInside].X-0.25; - DAMMStabGeometry2DSectionAssembler assembler = new DAMMStabGeometry2DSectionAssembler(); + DamMstabGeometry2DSectionAssembler assembler = new DamMstabGeometry2DSectionAssembler(); var geometry2DSectionParameters = new Geometry2DSectionParameters { SoilGeometry2DName = Path.GetFullPath(SoilGeometry2DName), @@ -108,7 +108,7 @@ StringBuilder LXMLOutput = null; var stabilityServiceAgent = new StabilityServiceAgent(); - stabilityServiceAgent.ConvertGeometry2DTo1D(LXMLInput, ref LXMLOutput); + stabilityServiceAgent.ConvertGeometry2DTo1D(LXMLInput, out LXMLOutput); XDocument docOut = XDocument.Parse(LXMLOutput.ToString()); Geometry2DSectionParameters geometry2DSectionParametersOut = assembler.CreateOutputObject(docOut); SoilProfile1D soilProfile = geometry2DSectionParametersOut.SoilProfile;