Changeset 1053

Timestamp:

12/22/08 18:24:33 (15 years ago)

Author:

gkronber

Message:

added problem injector for CEDMA problems and to create standard GP runs in the CEDMA dispatcher. #419 (Refactor CEDMA plugins)

Location:

branches/CEDMA-Refactoring-Ticket419

Files:

• HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj (modified) (2 diffs)
• HeuristicLab.CEDMA.Core/ProblemInjector.cs (added)
• HeuristicLab.CEDMA.Server/Dispatcher.cs (modified) (4 diffs)
• HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj (modified) (1 diff)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

@@ -99 +99 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ProblemInjector.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -119 +120 @@
       <Project>{7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}</Project>
       <Name>HeuristicLab.DataAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Data\HeuristicLab.Data.csproj">
+      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
+      <Name>HeuristicLab.Data</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Operators\HeuristicLab.Operators.csproj">

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/Dispatcher.cs

@@ -32 +32 @@
 using System.Linq;
 using HeuristicLab.CEDMA.Core;
+using HeuristicLab.GP.StructureIdentification;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.CEDMA.Server {
   public class Dispatcher {
-    private List<string> dispatchQueue;
+    private List<StandardGP> dispatchQueue;
     public IList<string> DispatchQueue {
-      get { return dispatchQueue.AsReadOnly(); }
+      get { return dispatchQueue.Select(t => "StandardGP").ToList(); }
     }
 
@@ -44 +46 @@
     public Dispatcher(IStore store) {
       this.store = store;
-      this.dispatchQueue = new List<string>();
+      this.dispatchQueue = new List<StandardGP>();
     }
 
@@ -50 +52 @@
       Dictionary<Entity, Dictionary<int, int>> numberOfModelsOfTargetVariableOfDataSet = new Dictionary<Entity, Dictionary<int, int>>();
       IList<Statement> datasetStatements = store.Select(new Statement(Ontology.AnyEntity, Ontology.PredicateInstanceOf, Ontology.TypeDataSet));
-      foreach (Statement datasetStatement in datasetStatements) {
+      foreach(Statement datasetStatement in datasetStatements) {
         numberOfModelsOfTargetVariableOfDataSet.Add(datasetStatement.Subject, new Dictionary<int, int>());
         IList<Statement> modelStatements = store.Select(new Statement(datasetStatement.Subject, Ontology.PredicateHasModel, Ontology.AnyEntity));
-        foreach (Statement modelStatement in modelStatements) {
+        foreach(Statement modelStatement in modelStatements) {
           IList<Statement> modelAttributeStatements = store.Select(new Statement((Entity)modelStatement.Property, Ontology.PredicateModelAttribute, Ontology.AnyEntity));
-          foreach (Statement modelAttrStatement in modelAttributeStatements) {
+          foreach(Statement modelAttrStatement in modelAttributeStatements) {
             var targetVariableStatements = store.Select(new Statement((Entity)modelAttrStatement.Property, Ontology.PredicateModelAttributeName, Ontology.AnyEntity))
                .Where(t => (string)((Literal)t.Property).Value == "TargetVariable")
                .SelectMany(t => store.Select(new Statement((Entity)modelAttrStatement.Property, Ontology.PredicateModelAttributeValue, Ontology.AnyEntity)))
                .GroupBy(t => (int)((Literal)t.Property).Value);
-            foreach (var targetVariable in targetVariableStatements) {
+            foreach(var targetVariable in targetVariableStatements) {
               numberOfModelsOfTargetVariableOfDataSet[datasetStatement.Subject].Add(targetVariable.Key, targetVariable.Count());
             }
@@ -69 +71 @@
         DataSet dataSet = new DataSet(store, dataSetEntry.Key);
         foreach(int targetVariable in dataSet.Problem.AllowedTargetVariables)
-          if (!dataSetEntry.Value.ContainsKey(targetVariable) || dataSetEntry.Value[targetVariable] < 10) {
-            QueueJob(dataSet.Name + " - target variable: " + targetVariable);
+          if(!dataSetEntry.Value.ContainsKey(targetVariable) || dataSetEntry.Value[targetVariable] < 10) {
+            QueueJob(CreateStandardGp(dataSet, targetVariable));
           }
       }
     }
 
-    private void QueueJob(string job) {
+    private StandardGP CreateStandardGp(DataSet dataSet, int targetVariable) {
+      ProblemInjector probInjector = new ProblemInjector(dataSet.Problem);
+      probInjector.TargetVariable = targetVariable;
+      StandardGP sgp = new StandardGP();
+      sgp.SetSeedRandomly = true;
+      sgp.MaxGenerations = 100;
+      sgp.PopulationSize = 10000;
+      sgp.Elites = 1;
+      sgp.ProblemInjector = probInjector;
+      return sgp;
+    }
+
+    private void QueueJob(StandardGP job) {
       dispatchQueue.Add(job);
     }
 
-    private string GetNextJob() {
-      if (dispatchQueue.Count == 0) FillDispatchQueue();
-      string next = dispatchQueue[0];
+    private StandardGP GetNextJob() {
+      if(dispatchQueue.Count == 0) FillDispatchQueue();
+      StandardGP next = dispatchQueue[0];
       dispatchQueue.RemoveAt(0);
       return next;

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

@@ -108 +108 @@
       <Name>HeuristicLab.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.GP.StructureIdentification\HeuristicLab.GP.StructureIdentification.csproj">
+      <Project>{74223A32-C726-4978-BE78-37113A18373C}</Project>
+      <Name>HeuristicLab.GP.StructureIdentification</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Grid\HeuristicLab.Grid.csproj">
       <Project>{545CE756-98D8-423B-AC2E-6E7D70926E5C}</Project>