Changeset 9166 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Mappings/tsp.xml

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.Web/Mappings/tsp.xml (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Mappings/tsp.xml

@@ -1 +1 @@
 <?xml version='1.0'?>
-<scenario problemType="HeuristicLab.Problems.TravelingSalesman.TravelingSalesman"
-          algorithmType="HeuristicLab.Algorithms.GeneticAlgorithm"
-      xmlns="urn:scenario-schema"
-          mapper="HeuristicLab.Controllers.HLMapper">
+<scenario xmlns="urn:scenario-schema">
   <name>Traveling Salesman Problem</name>
-  <problemParameters>
-    <param type="Decimal" name="BestKnownQuality" value="6110.0"/>
-    <param type="DecimalVector" name="BestKnownSolution">
-      <value v1="0"/>
-      <value v1="40"/>
-      <value v1="38"/>
-      <value v1="60"/>
-    </param>
-    <param type="DecimalMatrix" name="Coordinates">
-      <value v1="334.5909" v2="161.7809"/>
-      <value v1="503.5909" v2="172.7809"/>
-      <value v1="400.5909" v2="300.7809"/>
-      <value v1="700.5909" v2="700.7809"/>
-    </param>
-    <param type="Type" name="EvaluatorParameter">
-      <choice name="HeuristicLab.Problems.TravelingSalesman.TSPRoundedEuclideanPathEvaluator" />
-      <choice name="HeuristicLab.Problems.TravelingSalesman.TSPGeoPathEvaluator" selected="true"/>
-      <choice name="HeuristicLab.Problems.TravelingSalesman.TSPEuclideanPathEvaluator"/>
-    </param>    
-    <param type="Boolean" name="UseDistanceMatrix" value="true"/> 
-  </problemParameters>
-  <algorithmParameters>
-    <param type="Type" name="CrossoverParameter">
-      <choice name="OrderCrossover2"/>
-      <choice name="CosaCrossover" selected="true"/>
-    </param>    
-    <param type="Integer" name="Elites" value="1"/>
-    <param type="Integer" name="MaximumGenerations" value="1000"/>
-    <param type="Percent" name="MutationProbability" value="5"/>
-    <param type="Type" name="Mutator">
-      <choice name="InversionManipulator" selected="true"/>
-      <choice name="ScrambleManipulator"/>
-    </param>
-    <param type="Integer" name="PopulationSize" value="100"/>
-    <param type="Integer" name="Seed" value="100"/>
-    <param type="Type" name="Selector">
-      <choice name="ProportionalSelector" selected="true"/>
-      <choice name="BestSelector"/>
-    </param>
-    <param type="Boolean" name="SetSeedRandomly" value="true"/>
-  </algorithmParameters>
+  <algorithm mapper="HeuristicLab.Mappers.TSPScenarioMapper">
+    <parameters>
+    <param type="Type" name="CrossoverParameter">
+      <choice name="OrderCrossover2"/>
+      <choice name="CosaCrossover" selected="true"/>
+    </param>    
+    <param type="Integer" name="Elites" value="1"/>
+    <param type="Integer" name="MaximumGenerations" value="1000"/>
+    <param type="Percent" name="MutationProbability" value="5"/>
+    <param type="Type" name="Mutator">
+      <choice name="InversionManipulator" selected="true"/>
+      <choice name="ScrambleManipulator"/>
+    </param>
+    <param type="Integer" name="PopulationSize" value="100"/>
+    <param type="Integer" name="Seed" value="100"/>
+    <param type="Type" name="Selector">
+      <choice name="ProportionalSelector" selected="true"/>
+      <choice name="BestSelector"/>
+    </param>
+    <param type="Boolean" name="SetSeedRandomly" value="true"/>
+    </parameters>
+  <problem>
+    <parameters>
+      <param type="Decimal" name="BestKnownQuality" value="6110.0"/>
+      <param type="DecimalVector" name="BestKnownSolution">
+        <value v1="0"/>
+        <value v1="40"/>
+        <value v1="38"/>
+        <value v1="60"/>
+      </param>
+      <param type="DecimalMatrix" name="Coordinates">
+        <value v1="334.5909" v2="161.7809"/>
+        <value v1="503.5909" v2="172.7809"/>
+        <value v1="400.5909" v2="300.7809"/>
+        <value v1="700.5909" v2="700.7809"/>
+      </param>
+      <param type="Type" name="EvaluatorParameter">
+        <choice name="HeuristicLab.Problems.TravelingSalesman.TSPRoundedEuclideanPathEvaluator" />
+        <choice name="HeuristicLab.Problems.TravelingSalesman.TSPGeoPathEvaluator" selected="true"/>
+        <choice name="HeuristicLab.Problems.TravelingSalesman.TSPEuclideanPathEvaluator"/>
+      </param>    
+      <param type="Boolean" name="UseDistanceMatrix" value="true"/> 
+    </parameters>
+  </problem>
+  </algorithm>
 </scenario>