Changeset 312 for xssim/trunk/src

Timestamp:

07/12/12 13:36:54 (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

@@ -35 +35 @@
                                                 <xs:element name="computingResource" type="computingResourceType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                                                 <xs:element name="resourceUnit" type="resourceUnitType" minOccurs="0" maxOccurs="unbounded"></xs:element>
-                                                <xs:element name="otherParameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
+                                                <xs:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                                                 <xs:element name="energyEstimationPlugin" type="energyEstimationPluginType" minOccurs="0" maxOccurs="1"></xs:element>
                                                 <xs:element name="powerProfile" type="powerProfileType" minOccurs="0" maxOccurs="1"></xs:element>
@@ -57 +57 @@
                                         <xs:element name="computingResource" type="computingResourceType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                                         <xs:element name="resourceUnit" type="resourceUnitType" minOccurs="0" maxOccurs="unbounded"></xs:element>
-                                        <xs:element name="otherParameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
+                                        <xs:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                                         <xs:element name="energyEstimationPlugin" type="energyEstimationPluginType" minOccurs="0" maxOccurs="1"></xs:element>
                                         <xs:element name="powerProfile" type="powerProfileType" minOccurs="0" maxOccurs="1"></xs:element>
                                 </xs:sequence>
-                                <xs:attribute name="templateId" type="xs:IDREF" use="optional"/>
                         </xs:extension>
                 </xs:complexContent>
@@ -91 +90 @@
                         <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
                         <xs:element name="frequency" type="xs:integer" minOccurs="0" maxOccurs="1"></xs:element>
+                        <xs:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"></xs:element>
                 </xs:sequence>
         </xs:complexType>
@@ -101 +101 @@
                         <xs:extension base="resourceType">
                                 <xs:sequence>
-                                        <xs:element name="amount" type="xs:integer"/>
+                                        <xs:element name="amount" type="xs:double"/>
                                 </xs:sequence>
                         </xs:extension>
@@ -202 +202 @@
         </xs:complexType>
         
+        <xs:complexType name="fanType">
+                <xs:annotation>
+                        <xs:documentation>Description of the fan of computing resource</xs:documentation>
+                </xs:annotation>
+                <xs:sequence>
+                        <xs:element name="speed" type="xs:double" minOccurs="1"></xs:element>
+                        <xs:element name="power" type="xs:double" minOccurs="0" maxOccurs="1"></xs:element>
+                        <xs:element name="power" type="xs:double" minOccurs="0" maxOccurs="1"></xs:element>
+                        <xs:element name="transition" type="energyStatesTransitionType" minOccurs="0" maxOccurs="unbounded"></xs:element>
+                </xs:sequence>
+        </xs:complexType>
+        
         <xs:complexType name="locationType">
                 <xs:annotation>
@@ -215 +227 @@
         <xs:complexType name="parameterType">
                 <xs:annotation>
-                        <xs:documentation>Base description of parameter of resource</xs:documentation>
-                </xs:annotation>
-                <xs:sequence>
-                        <xs:element name="paramValue" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:documentation>Description of parameter of resource</xs:documentation>
+                </xs:annotation>
+                <xs:sequence>
+                        <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
                 </xs:sequence>
                 <xs:attribute name="name" type="xs:string" use="required"/>