Changeset 1869 for trunk/sources

Timestamp:

05/20/09 12:52:52 (16 years ago)

Author:

gkronber

Message:

Moved simple evaluators from plugin SVM to plugin Modeling. #635

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Server/3.3/DispatcherBase.cs (modified) (2 diffs)
• HeuristicLab.Modeling/3.2/HeuristicLab.Modeling-3.2.csproj (modified) (1 diff)
• HeuristicLab.Modeling/3.2/SimpleMSEEvaluator.cs (moved) (moved from trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SimpleMSEEvaluator.cs) (2 diffs)
• HeuristicLab.Modeling/3.2/SimpleR2Evaluator.cs (moved) (moved from trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SimpleR2Evaluator.cs) (2 diffs)
• HeuristicLab.SupportVectorMachines/3.2/HeuristicLab.SupportVectorMachines-3.2.csproj (modified) (1 diff)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs (modified) (1 diff)

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

@@ -40 +40 @@
   public abstract class DispatcherBase : IDispatcher {
     private IStore store;
-
-    private static int MaxGenerations {
-      get { return 3; }
-    }
-
-    private static int MaxEvaluatedSolutions {
-      get { return 3000; }
-    }
-
     public DispatcherBase(IStore store) {
       this.store = store;
@@ -88 +79 @@
 
     private Execution CreateExecution(Problem problem, int targetVariable, IAlgorithm algorithm) {
-      //switch (algorithm) {
-      //  case Algorithm.StandardGpRegression: {
-      //      var algo = new HeuristicLab.GP.StructureIdentification.StandardGP();
-      //      SetComplexityParameters(algo, complexity);
-      //      SetProblemParameters(algo, problem, targetVariable);
-      //      algo.PopulationSize = 10000;
-      //      algo.MaxGenerations = MaxGenerations;
-      //      Execution exec = new Execution(algo.Engine);
-      //      exec.Description = "StandardGP - Complexity: " + complexity;
-      //      return exec;
-      //    }
       SetProblemParameters(algorithm, problem, targetVariable);
       Execution exec = new Execution(algorithm.Engine);

trunk/sources/HeuristicLab.Modeling/3.2/HeuristicLab.Modeling-3.2.csproj

@@ -96 +96 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SimpleMSEEvaluator.cs" />
+    <Compile Include="SimpleR2Evaluator.cs" />
     <Compile Include="TimeSeriesProblemInjector.cs" />
   </ItemGroup>

trunk/sources/HeuristicLab.Modeling/3.2/SimpleMSEEvaluator.cs

@@ -7 +7 @@
 using HeuristicLab.DataAnalysis;
 
-namespace HeuristicLab.SupportVectorMachines {
-  public class SimpleMSEEvaluator : OperatorBase{
+namespace HeuristicLab.Modeling {
+  public class SimpleMSEEvaluator : OperatorBase {
 
     public SimpleMSEEvaluator()
       : base() {
-      AddVariableInfo(new VariableInfo("Values", "Target vs predicted values", typeof(ItemList), VariableKind.In));
+      AddVariableInfo(new VariableInfo("Values", "Target vs predicted values", typeof(DoubleMatrixData), VariableKind.In));
       AddVariableInfo(new VariableInfo("MSE", "Mean squarred error", typeof(DoubleData), VariableKind.New | VariableKind.Out));
     }
 
     public override IOperation Apply(IScope scope) {
-      ItemList values = GetVariableValue<ItemList>("Values", scope, true);
+      DoubleMatrixData values = GetVariableValue<DoubleMatrixData>("Values", scope, true);
       double sse = 0;
-      double cnt = 0;      
-      foreach (ItemList row in values) {
-        double estimated = ((DoubleData)row[0]).Data;
-        double target = ((DoubleData)row[1]).Data;
+      double cnt = 0;
+      for (int i = 0; i < values.Data.GetLength(0); i++) {
+        double estimated = values.Data[i, 0];
+        double target = values.Data[i, 1];
         if (!double.IsNaN(estimated) && !double.IsInfinity(estimated) &&
             !double.IsNaN(target) && !double.IsInfinity(target)) {
@@ -32 +32 @@
 
       double mse = sse / cnt;
-      scope.AddVariable(new Variable(scope.TranslateName("MSE"),new DoubleData(mse)));
+      scope.AddVariable(new Variable(scope.TranslateName("MSE"), new DoubleData(mse)));
       return null;
     }

trunk/sources/HeuristicLab.Modeling/3.2/SimpleR2Evaluator.cs

@@ -7 +7 @@
 using HeuristicLab.DataAnalysis;
 
-namespace HeuristicLab.SupportVectorMachines {
-  public class SimpleR2Evaluator : OperatorBase{
+namespace HeuristicLab.Modeling {
+  public class SimpleR2Evaluator : OperatorBase {
 
     public SimpleR2Evaluator()
       : base() {
-      AddVariableInfo(new VariableInfo("Values", "Target vs predicted values", typeof(ItemList), VariableKind.In));
+      AddVariableInfo(new VariableInfo("Values", "Target vs predicted values", typeof(DoubleMatrixData), VariableKind.In));
       AddVariableInfo(new VariableInfo("R2", "Coefficient of determination", typeof(DoubleData), VariableKind.New | VariableKind.Out));
     }
 
     public override IOperation Apply(IScope scope) {
-      ItemList values = GetVariableValue<ItemList>("Values", scope, true);
+      DoubleMatrixData values = GetVariableValue<DoubleMatrixData>("Values", scope, true);
 
       double targetMean = 0;
       double sse = 0;
       double cnt = 0;
-      foreach (ItemList row in values) {                                
-        double estimated = ((DoubleData)row[0]).Data;
-        double target = ((DoubleData)row[1]).Data;
+      for (int i = 0; i < values.Data.GetLength(0); i++) {
+        double estimated = values.Data[i, 0];
+        double target = values.Data[i, 1];
         if (!double.IsNaN(estimated) && !double.IsInfinity(estimated) &&
             !double.IsNaN(target) && !double.IsInfinity(target)) {
@@ -36 +36 @@
 
       double targetDeviationTotalSumOfSquares = 0;
-      foreach (ItemList row in values) {
-        double target = ((DoubleData)row[1]).Data;
+      for (int i = 0; i < values.Data.GetLength(0); i++) {
+        double target = values.Data[i, 1];
         if (!double.IsNaN(target) && !double.IsInfinity(target)) {
           target = target - targetMean;

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/HeuristicLab.SupportVectorMachines-3.2.csproj

@@ -86 +86 @@
     <Compile Include="HeuristicLabSupportVectorMachinesPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SimpleMSEEvaluator.cs" />
-    <Compile Include="SimpleR2Evaluator.cs" />
     <Compile Include="SupportVectorCreator.cs" />
     <Compile Include="SupportVectorEvaluator.cs" />

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs

@@ -146 +146 @@
       solStorer.GetVariableInfo("Quality").ActualName = "ValidationMSE";
       solStorer.GetVariableInfo("Maximization").Local = true;
+      solStorer.GetVariableInfo("BestSolution").ActualName = "BestValidationSolution";
       solStorer.AddVariable(new HeuristicLab.Core.Variable("Maximization", new BoolData(false)));