Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5501 for branches


Ignore:
Timestamp:
02/17/11 01:19:27 (13 years ago)
Author:
mkommend
Message:

#1418: Corrected namespaces and added symbolic classification specific evaluators.

Location:
branches/DataAnalysis Refactoring
Files:
2 added
11 edited
7 copied

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj

    r5500 r5501  
    108108  </ItemGroup>
    109109  <ItemGroup>
     110    <Compile Include="MultiObjective\SymbolicClassificationMultiObjectiveEvaluator.cs" />
     111    <Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveEvaluator.cs" />
     112    <Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs" />
     113    <Compile Include="SingleObjective\SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator.cs" />
    110114    <None Include="HeuristicLab.snk" />
    111115    <None Include="HeuristicLabProblemsDataAnalysisSymbolicClassificationPlugin.cs.frame" />
    112116    <None Include="Properties\AssemblyInfo.frame" />
    113117    <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicClassificationPlugin.cs" />
     118    <Compile Include="Interfaces\ISymbolicClassificationEvaluator.cs" />
     119    <Compile Include="Interfaces\ISymbolicClassificationMultiObjectiveEvaluator.cs" />
     120    <Compile Include="Interfaces\ISymbolicClassificationSingleObjectiveEvaluator.cs" />
    114121    <Compile Include="Properties\AssemblyInfo.cs" />
    115122  </ItemGroup>
    … …  
    139146      <Name>HeuristicLab.Data-3.3</Name>
    140147    </ProjectReference>
    141     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    142       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    143       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     148    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     149      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     150      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    144151    </ProjectReference>
    145152    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    … …  
    183190      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    184191    </ProjectReference>
    185     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    186       <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    187       <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     192    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     193      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     194      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     195    </ProjectReference>
     196    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     197      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     198      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    188199    </ProjectReference>
    189200    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    … …  
    209220    </BootstrapperPackage>
    210221  </ItemGroup>
    211   <ItemGroup>
    212     <Folder Include="MultiObjective\" />
    213     <Folder Include="SingleObjective\Interfaces\" />
    214   </ItemGroup>
     222  <ItemGroup />
    215223  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    216224  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationEvaluator.cs

    r5500 r5501  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    24   public interface ISymbolicRegressionEvaluator : IRegressionEvaluator, ISymbolicDataAnalysisEvaluator {
     22namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     23  public interface ISymbolicClassificationEvaluator : IClassificationEvaluator, ISymbolicDataAnalysisEvaluator {
    2524  }
    2625}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationMultiObjectiveEvaluator.cs

    r5500 r5501  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    23   public interface ISymbolicRegressionMultiObjectiveEvaluator : ISymbolicRegressionEvaluator, ISymbolicDataAnalysisMultiObjectiveEvaluator {
     22namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     23  public interface ISymbolicClassificationMultiObjectiveEvaluator : ISymbolicClassificationEvaluator, ISymbolicDataAnalysisMultiObjectiveEvaluator {
    2424  }
    2525}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationSingleObjectiveEvaluator.cs

    r5500 r5501  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    23   public interface ISymbolicRegressionSingleObjectiveEvaluator : ISymbolicRegressionEvaluator, ISymbolicDataAnalysisSingleObjectiveEvaluator {
     22namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     23  public interface ISymbolicClassificationSingleObjectiveEvaluator : ISymbolicClassificationEvaluator, ISymbolicDataAnalysisSingleObjectiveEvaluator {
    2424  }
    2525}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveEvaluator.cs

    r5500 r5501  
    2020#endregion
    2121
    22 
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    26   public abstract class SymbolicRegressionMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator, ISymbolicRegressionEvaluator {
    27     public new IRegressionProblemData ProblemData {
    28       get { return (IRegressionProblemData)base.ProblemData; }
     24
     25namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     26  public abstract class SymbolicClassificationMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator, ISymbolicClassificationMultiObjectiveEvaluator {
     27    public new IClassificationProblemData ProblemData {
     28      get { return (IClassificationProblemData)base.ProblemData; }
    2929    }
    3030
    3131    [StorableConstructor]
    32     protected SymbolicRegressionMultiObjectiveEvaluator(bool deserializing) : base(deserializing) { }
    33     protected SymbolicRegressionMultiObjectiveEvaluator(SymbolicRegressionMultiObjectiveEvaluator original, Cloner cloner)
     32    protected SymbolicClassificationMultiObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     33    protected SymbolicClassificationMultiObjectiveEvaluator(SymbolicClassificationMultiObjectiveEvaluator original, Cloner cloner)
    3434      : base(original, cloner) {
    3535    }
    3636
    37     protected SymbolicRegressionMultiObjectiveEvaluator()
     37    protected SymbolicClassificationMultiObjectiveEvaluator()
    3838      : base() {
    3939

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveEvaluator.cs

    r5500 r5501  
    2020#endregion
    2121
    22 
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    26   public abstract class SymbolicRegressionSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator, ISymbolicRegressionEvaluator {
    27     public new IRegressionProblemData ProblemData {
    28       get { return (IRegressionProblemData)base.ProblemData; }
     24
     25namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     26  public abstract class SymbolicClassificationSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator, ISymbolicClassificationSingleObjectiveEvaluator {
     27    public new IClassificationProblemData ProblemData {
     28      get { return (IClassificationProblemData)base.ProblemData; }
    2929    }
    3030
    3131    [StorableConstructor]
    32     protected SymbolicRegressionSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
    33     protected SymbolicRegressionSingleObjectiveEvaluator(SymbolicRegressionSingleObjectiveEvaluator original, Cloner cloner)
     32    protected SymbolicClassificationSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     33    protected SymbolicClassificationSingleObjectiveEvaluator(SymbolicClassificationSingleObjectiveEvaluator original, Cloner cloner)
    3434      : base(original, cloner) {
    3535    }
    3636
    37     protected SymbolicRegressionSingleObjectiveEvaluator()
     37    protected SymbolicClassificationSingleObjectiveEvaluator()
    3838      : base() {
    3939

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs

    r5500 r5501  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    30   [Item("Mean squared error evaluator", "Calculates the mean squared error of a symbolic regression solution.")]
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     30  [Item("Mean squared error evaluator", "Calculates the mean squared error of a symbolic classification solution.")]
    3131  [StorableClass]
    32   public class SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator : SymbolicRegressionSingleObjectiveEvaluator {
     32  public class SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator : SymbolicClassificationSingleObjectiveEvaluator {
    3333    [StorableConstructor]
    34     protected SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { }
    35     protected SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator(SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator original, Cloner cloner)
     34    protected SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { }
     35    protected SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator original, Cloner cloner)
    3636      : base(original, cloner) {
    3737    }
    3838    public override IDeepCloneable Clone(Cloner cloner) {
    39       return new SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator(this, cloner);
     39      return new SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(this, cloner);
    4040    }
    4141
    … …  
    4747    }
    4848
    49     public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IRegressionProblemData problemData, IEnumerable<int> rows) {
     49    public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IClassificationProblemData problemData, IEnumerable<int> rows) {
    5050      IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
    5151      IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows);

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator.cs

    r5500 r5501  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.SingleObjective.Evaluators {
    30   [Item("Pearson R² evaluator", "Calculates the square of the pearson correlation coefficient (also known as coefficient of determination) of a symbolic regression solution.")]
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     30  [Item("Pearson R² evaluator", "Calculates the square of the pearson correlation coefficient (also known as coefficient of determination) of a symbolic classification solution.")]
    3131  [StorableClass]
    32   public class SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator : SymbolicRegressionSingleObjectiveEvaluator {
     32  public class SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator : SymbolicClassificationSingleObjectiveEvaluator {
    3333    [StorableConstructor]
    34     protected SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(bool deserializing) : base(deserializing) { }
    35     protected SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator original, Cloner cloner)
     34    protected SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(bool deserializing) : base(deserializing) { }
     35    protected SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator original, Cloner cloner)
    3636      : base(original, cloner) {
    3737    }
    3838    public override IDeepCloneable Clone(Cloner cloner) {
    39       return new SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(this, cloner);
     39      return new SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(this, cloner);
    4040    }
    4141
    … …  
    4747    }
    4848
    49     public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IRegressionProblemData problemData, IEnumerable<int> rows) {
     49    public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IClassificationProblemData problemData, IEnumerable<int> rows) {
    5050      IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
    5151      IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows);

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/Evaluators/SymbolicRegressionMultiObjectiveEvaluator.cs

    r5500 r5501  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    26   public abstract class SymbolicRegressionMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator, ISymbolicRegressionEvaluator {
     26  public abstract class SymbolicRegressionMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator, ISymbolicRegressionMultiObjectiveEvaluator {
    2727    public new IRegressionProblemData ProblemData {
    2828      get { return (IRegressionProblemData)base.ProblemData; }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveEvaluator.cs

    r5500 r5501  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    26   public abstract class SymbolicRegressionSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator, ISymbolicRegressionEvaluator {
     26  public abstract class SymbolicRegressionSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator, ISymbolicRegressionSingleObjectiveEvaluator {
    2727    public new IRegressionProblemData ProblemData {
    2828      get { return (IRegressionProblemData)base.ProblemData; }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs

    r5500 r5501  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.SingleObjective.Evaluators {
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    3030  [Item("Pearson R² evaluator", "Calculates the square of the pearson correlation coefficient (also known as coefficient of determination) of a symbolic regression solution.")]
    3131  [StorableClass]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEvaluator.cs

    r5500 r5501  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Classification {
     22namespace HeuristicLab.Problems.DataAnalysis {
    2323  public interface IClassificationEvaluator : IDataAnalysisEvaluator {
    2424    new IClassificationProblemData ProblemData { get; }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationModel.cs

    r5496 r5501  
    2121
    2222using System.Collections.Generic;
    23 namespace HeuristicLab.Problems.DataAnalysis.Classification {
     23namespace HeuristicLab.Problems.DataAnalysis {
    2424  public interface IClassificationModel : IDataAnalysisModel {
    2525    IEnumerable<double> GetEstimatedValues(IClassificationProblemData problemData, IEnumerable<int> rows);

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblem.cs

    r5496 r5501  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Classification {
     22namespace HeuristicLab.Problems.DataAnalysis {
    2323  public interface IClassificationProblem : IDataAnalysisProblem {
    2424    new IClassificationProblemData ProblemData { get; }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblemData.cs

    r5496 r5501  
    2121
    2222using System.Collections.Generic;
    23 namespace HeuristicLab.Problems.DataAnalysis.Classification {
     23namespace HeuristicLab.Problems.DataAnalysis {
    2424  public interface IClassificationProblemData : IDataAnalysisProblemData {
    2525    string TargetVariable { get; }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolution.cs

    r5496 r5501  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Classification {
     22namespace HeuristicLab.Problems.DataAnalysis {
    2323  public interface IClassificationSolution : IDataAnalysisSolution {
    2424    new IClassificationModel Model { get; }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolutionCreator.cs

    r5496 r5501  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Classification {
     22namespace HeuristicLab.Problems.DataAnalysis {
    2323  public interface IClassificationSolutionCreator : IDataAnalysisSolutionCreator {
    2424  }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs

    r5500 r5501  
    2121
    2222namespace HeuristicLab.Problems.DataAnalysis {
    23   public interface IClassificationSolution : IDataAnalysisSolution {
     23  public interface IRegressionnSolution : IDataAnalysisSolution {
    2424    new IRegressionModel Model { get; }
    2525    new IRegressionProblemData ProblemData { get; }
Note: See TracChangeset for help on using the changeset viewer.