Index: dam engine/trunk/Xsds Liquid/GenerateClasses.bat =================================================================== diff -u -r401 -r405 --- dam engine/trunk/Xsds Liquid/GenerateClasses.bat (.../GenerateClasses.bat) (revision 401) +++ dam engine/trunk/Xsds Liquid/GenerateClasses.bat (.../GenerateClasses.bat) (revision 405) @@ -1,2 +1,7 @@ xsd /c /l:cs /n:Deltares.DamEngine.Io.XmlInput DamInput.xsd +copy DamInput.cs ..\src\Deltares.DamEngine.Io\DamInput.cs + xsd /c /l:cs /n:Deltares.DamEngine.Io.XmlOutput DamOutput.xsd +copy DamOutput.cs ..\src\Deltares.DamEngine.Io\DamOutput.cs + +pause \ No newline at end of file Index: dam engine/trunk/src/Deltares.DamEngine.Io/XmlSerialization.cs =================================================================== diff -u -r403 -r405 --- dam engine/trunk/src/Deltares.DamEngine.Io/XmlSerialization.cs (.../XmlSerialization.cs) (revision 403) +++ dam engine/trunk/src/Deltares.DamEngine.Io/XmlSerialization.cs (.../XmlSerialization.cs) (revision 405) @@ -1,21 +1,31 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using Deltares.DamEngine.Io.XmlInput; +using System.Xml.Serialization; +using Deltares.DamEngine.Io.XmlOutput; +using Input = Deltares.DamEngine.Io.XmlInput.Input; namespace Deltares.DamEngine.Io { public static class XmlSerialization { public static void SaveInputAsXml(string filename, Input input) { - + XmlSerializer xmlSerializer = new XmlSerializer(typeof(Input)); + TextWriter writer = new StreamWriter(filename); + xmlSerializer.Serialize(writer, input); + writer.Close(); } public static Input LoadInputFromXml(string filename) { - return null; + Input input; + XmlSerializer xmlSerializer = new XmlSerializer(typeof(Input)); + FileStream fs = new FileStream(filename, FileMode.Open); + input = (Input)xmlSerializer.Deserialize(fs); + return input; } } } Index: dam engine/trunk/src/Deltares.DamEngine.Io.Tests/XmlSerializationTests.cs =================================================================== diff -u -r403 -r405 --- dam engine/trunk/src/Deltares.DamEngine.Io.Tests/XmlSerializationTests.cs (.../XmlSerializationTests.cs) (revision 403) +++ dam engine/trunk/src/Deltares.DamEngine.Io.Tests/XmlSerializationTests.cs (.../XmlSerializationTests.cs) (revision 405) @@ -27,7 +27,7 @@ private Input CreatePopulatedInput() { Input input = new Input(); - input.DamProjectType = InputDamProjectType.Assessment; + input.DamProjectType = InputDamProjectType.Design; return input; }