Index: DamEngine/trunk/xsd/DamTimeSerie.xsd
===================================================================
diff -u -r1554 -r6088
--- DamEngine/trunk/xsd/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 1554)
+++ DamEngine/trunk/xsd/DamTimeSerie.xsd	(.../DamTimeSerie.xsd)	(revision 6088)
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:include schemaLocation=".\Common\Point2D.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\WaternetCalculation.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\BishopCalculationGridTypeDefinition.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\UpliftVanCalculationGridTypeDefinition.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\BishopCalculatedSlipPlaneTypeDefinition.xsd" />
+  <xs:include schemaLocation=".\OutputTypes\UpliftVanCalculatedSlipPlaneTypeDefinition.xsd" />
   <xs:complexType name="TimeSerie">
     <xs:sequence>
       <xs:element minOccurs="1" maxOccurs="1" name="TimeStep">
@@ -31,19 +37,15 @@
             <xs:element name="TimeSerieEntry">
               <xs:complexType>
                 <xs:sequence>
-                  <xs:element minOccurs="0" maxOccurs="1" name="StochastValue">
-                    <xs:complexType>
-                      <xs:attribute name="Mean" type="xs:double" use="required" />
-                      <xs:attribute name="StandardDeviation" type="xs:double" use="required" />
-                      <xs:attribute name="Distribution" type="xs:int" use="required" />
-                    </xs:complexType>
-                  </xs:element>
+                  <xs:element minOccurs="0" maxOccurs="1" name="Waternet" type="WaternetType" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="BishopCalculationGrid" type="BishopCalculationGridType" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="UpliftVanCalculationGrid" type="UpliftVanCalculationGridType" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="BishopCalculatedSlipPlane" type="BishopCalculatedSlipPlaneType" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="UpliftVanCalculatedSlipPlane" type="UpliftVanCalculatedSlipPlaneType" />
                 </xs:sequence>
                 <xs:attribute name="DateTime" type="xs:dateTime" use="required" />
-                <xs:attribute name="Value" type="xs:double" use="required" />
-                <xs:attribute name="Flag-nietechtgebruikt" type="xs:int" use="required" />
-                <xs:attribute name="BasisFileNameWMF" type="xs:string" use="required" />
-                <xs:attribute name="RelativeCalculationPathName" type="xs:string" use="required" />
+                <xs:attribute name="SafetyFactor" type="xs:double" use="required" />
+                <xs:attribute name="IsUplift" type="xs:boolean" />
               </xs:complexType>
             </xs:element>
           </xs:sequence>