Changeset 2057 for trunk

Timestamp:

06/18/09 12:45:47 (15 years ago)

Author:

gkronber

Message:

Improved stability of hive backend for CEDMA. #642 (Hive backend for CEDMA)

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/HeuristicLabCedmaServerPlugin.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/HiveExecuter.cs (modified) (2 diffs)
• HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs

@@ -69 +69 @@
     protected abstract void StartJobs();
 
+    protected void SetResults(IScope src, IScope target) {
+      foreach (IVariable v in src.Variables) {
+        target.AddVariable(v);
+      }
+      foreach (IScope subScope in src.SubScopes) {
+        target.AddSubScope(subScope);
+      }
+      foreach (KeyValuePair<string, string> alias in src.Aliases) {
+        target.AddAlias(alias.Key, alias.Value);
+      }
+    }
+
     protected void StoreResults(IAlgorithm finishedAlgorithm) {
       Entity modelEntity = new Entity(Ontology.CedmaNameSpace + Guid.NewGuid());
+      IModel model = finishedAlgorithm.Model;
       List<Statement> statements = new List<Statement>();
       statements.Add(new Statement(modelEntity, Ontology.InstanceOf, Ontology.TypeModel));
-      statements.Add(new Statement(modelEntity, Ontology.TargetVariable, new Literal(finishedAlgorithm.Model.TargetVariable)));
+      statements.Add(new Statement(modelEntity, Ontology.TargetVariable, new Literal(model.TargetVariable)));
       statements.Add(new Statement(modelEntity, Ontology.Name, new Literal(finishedAlgorithm.Description)));
       
-      IModel model = finishedAlgorithm.Model;
       statements.Add(new Statement(modelEntity, Ontology.TrainingMeanSquaredError, new Literal(model.TrainingMeanSquaredError)));
       statements.Add(new Statement(modelEntity, Ontology.ValidationMeanSquaredError, new Literal(model.ValidationMeanSquaredError)));

trunk/sources/HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs

@@ -107 +107 @@
     }
 
-    private void SetResults(IScope src, IScope target) {
-      foreach (IVariable v in src.Variables) {
-        target.AddVariable(v);
-      }
-      foreach (IScope subScope in src.SubScopes) {
-        target.AddSubScope(subScope);
-      }
-      foreach (KeyValuePair<string, string> alias in src.Aliases) {
-        target.AddAlias(alias.Key, alias.Value);
-      }
-    }
-
     public override string[] GetJobs() {
       lock (activeAlgorithms) {

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj

@@ -156 +156 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj">
+      <Project>{EE2034D9-6E27-48A1-B855-42D45F69A4FC}</Project>
+      <Name>HeuristicLab.Tracing-3.2</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLabCedmaServerPlugin.cs

@@ -35 +35 @@
   [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
   [Dependency(Dependency = "HeuristicLab.Modeling-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Tracing-3.2")]
   public class HeuristicLabCedmaServerPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HiveExecuter.cs

@@ -95 +95 @@
               activeAlgorithms.Remove(readyHandle);
             }
+            SetResults(finishedEngine.GlobalScope, finishedAlgorithm.Engine.GlobalScope);
             StoreResults(finishedAlgorithm);
             readyHandle.Close();
@@ -100 +101 @@
         }
         catch (Exception ex) {
-          Trace.WriteLine("CEDMA Executer: Exception in job-management thread. " + ex.Message);
+          HeuristicLab.Tracing.HiveLogger.Debug("CEDMA Executer: Exception in job-management thread. " + ex.Message + "\n" + ex.StackTrace);
         }
       }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs

@@ -416 +416 @@
 
     protected internal virtual Model CreateGPModel(IScope bestModelScope) {
+      Engine.GlobalScope.AddSubScope(bestModelScope);
       Model model = new Model();
       Dataset ds = bestModelScope.GetVariableValue<Dataset>("Dataset", true);
@@ -442 +443 @@
         model.SetVariableQualityImpact(variableName, impact);
       }
+      Engine.GlobalScope.RemoveSubScope(bestModelScope);
       return model;
     }