Changeset 9166 for branches/OaaS/HeuristicLab.Services.Optimization.ControllerService.Tests/mappings/scenario.xsd

Timestamp:

01/15/13 15:50:53 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Model: OptimizationScenario may be a tree of algorithms (and problems)
• Model: Renamed InputParameters to ProblemParameters (as they are the parameters of a problem)
• Model: Added JobExecutionDetails which contain Repetitions + Group (resource to use)
• ScenarioParser parses the new XML scenario files
• Website + Model: You are now able to add/remove rows from a table (no JavaScript involved yet)
• Website + Controller: Added repetitions (enables batch jobs) and group (resource to use) to OaaS which will be used by the controller to schedule the job
• Website: Updated templates to use new model structure
• Website + Scenarios: Added the new algorithm Benchmark Algorithm
• Controller: Added a singleton to make the (Azure/Mockup)-DAL exchangeable
• Controller: Added mockup classes for DAL + IScenarioManager
• Website/Result Page: Line Diagrams will be added via JavaScript, crawling their data using AJAX
• Website: Most configuration parameters can be set in the ServiceDefinition directly
• Added a mockup for the Membership classes: These can be used if no network connection is available or if other parts of the app shall be tested
• Scenarios: Updated TSP mappings to new xsd

File:

• branches/OaaS/HeuristicLab.Services.Optimization.ControllerService.Tests/mappings/scenario.xsd (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.ControllerService.Tests/mappings/scenario.xsd

@@ -8 +8 @@
  <xsd:complexType name="scenarioType">
   <xsd:sequence maxOccurs="1">   
-   <xsd:element name="name" type="xsd:string"/>
-   <xsd:element name="problemParameters" type="paramsType"/>
-   <xsd:element name="algorithmParameters" type="paramsType"/>
-  </xsd:sequence>
-  <xsd:attribute name="problemType" use="required"/>
-  <xsd:attribute name="algorithmType" use="required"/>
-  <xsd:attribute name="mapper" use="required"/>
+   <xsd:element name="name" minOccurs="1" type="xsd:string"/>   
+   <xsd:element name="algorithm" minOccurs="1" maxOccurs="unbounded" type="algorithmType"/>   
+  </xsd:sequence>  
  </xsd:complexType>
+
+<xsd:complexType name="algorithmType">
+  <xsd:sequence maxOccurs="1">
+  <xsd:element name="parameters" type="paramsType"/>
+  <xsd:element name="problem" minOccurs="0" type="problemType"/>  
+  <xsd:element name="algorithm" minOccurs="0" maxOccurs="unbounded" type="algorithmType"/>    
+  </xsd:sequence>  
+  <xsd:attribute name="mapper" use="required"/>   
+</xsd:complexType>
+
+<xsd:complexType name="problemType">
+  <xsd:sequence maxOccurs="1">
+  <xsd:element name="parameters" type="paramsType"/>  
+  </xsd:sequence>  
+  <xsd:attribute name="class"/> 
+</xsd:complexType>
 
  <xsd:complexType name="paramsType">
   <xsd:sequence>
-   <xsd:element name="param" type="parameterType" minOccurs="1" maxOccurs="unbounded"/>      
+   <xsd:element name="param" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>      
   </xsd:sequence>  
  </xsd:complexType>