Changeset 319 for xssim/trunk/src

Timestamp:

07/16/12 09:43:27 (13 years ago)

Author:

wojtekp

Message:

 

File:

• xssim/trunk/src/test/rewolucja/schemas/XSSimResSchema.xsd (modified) (6 diffs)

xssim/trunk/src/test/rewolucja/schemas/XSSimResSchema.xsd

@@ -175 +175 @@
                 <xs:sequence>
                         <xs:element name="name" type="xs:string"></xs:element>
-                        <xs:element name="power" type="xs:double" minOccurs="0" maxOccurs="1"></xs:element>
+                        <xs:element name="powerUsage" type="xs:double" minOccurs="0" maxOccurs="1"></xs:element>
                         <xs:element name="transition" type="energyStatesTransitionType" minOccurs="0" maxOccurs="unbounded"></xs:element>
+                        <xs:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                 </xs:sequence>
         </xs:complexType>
@@ -186 +187 @@
                 <xs:sequence>
                         <xs:element name="to" type="xs:string"></xs:element>
-                        <xs:element name="power" type="xs:double"></xs:element>
+                        <xs:element name="powerUsage" type="xs:double"></xs:element>
                         <xs:element name="time" type="xs:double"></xs:element>
+                        <xs:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                 </xs:sequence>
         </xs:complexType>
@@ -196 +198 @@
                 </xs:annotation>
                 <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                        <xs:element name="airThroughput" type="airThroughputType"></xs:element>
-                </xs:sequence>
-        </xs:complexType>
-        
-        <xs:complexType name="airThroughputType">
+                        <xs:element name="airThroughputState" type="airThroughputStateType"></xs:element>
+                </xs:sequence>
+        </xs:complexType>
+        
+        <xs:complexType name="airThroughputStateType">
                 <xs:annotation>
                         <xs:documentation>Definition of the power state</xs:documentation>
@@ -207 +209 @@
                         <xs:element name="name" type="xs:string"></xs:element>
                         <xs:element name="value" type="xs:double"></xs:element>
-                        <xs:element name="powerConsumption" type="xs:double" minOccurs="0"></xs:element>
+                        <xs:element name="powerUsage" type="xs:double" minOccurs="0"></xs:element>
+                        <xs:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                 </xs:sequence>
         </xs:complexType>
@@ -219 +222 @@
                         <xs:element name="horizontal" type="xs:long"/>
                         <xs:element name="depth" type="xs:long"/>
+                        <xs:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                 </xs:sequence>
         </xs:complexType>
@@ -231 +235 @@
                                 <xs:element name="property">
                                 <xs:complexType>
-                                        <xs:sequence>
+                                        <xs:sequence minOccurs="0" maxOccurs="unbounded">
                                                 <xs:element name="value" type="xs:string"/>
                                         </xs:sequence>