Changeset 5501
- Timestamp:
- 02/17/11 01:19:27 (14 years ago)
- Location:
- branches/DataAnalysis Refactoring
- Files:
-
- 2 added
- 11 edited
- 7 copied
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj ¶
r5500 r5501 108 108 </ItemGroup> 109 109 <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" /> 110 114 <None Include="HeuristicLab.snk" /> 111 115 <None Include="HeuristicLabProblemsDataAnalysisSymbolicClassificationPlugin.cs.frame" /> 112 116 <None Include="Properties\AssemblyInfo.frame" /> 113 117 <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicClassificationPlugin.cs" /> 118 <Compile Include="Interfaces\ISymbolicClassificationEvaluator.cs" /> 119 <Compile Include="Interfaces\ISymbolicClassificationMultiObjectiveEvaluator.cs" /> 120 <Compile Include="Interfaces\ISymbolicClassificationSingleObjectiveEvaluator.cs" /> 114 121 <Compile Include="Properties\AssemblyInfo.cs" /> 115 122 </ItemGroup> … … 139 146 <Name>HeuristicLab.Data-3.3</Name> 140 147 </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> 144 151 </ProjectReference> 145 152 <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj"> … … 183 190 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 184 191 </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> 188 199 </ProjectReference> 189 200 <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj"> … … 209 220 </BootstrapperPackage> 210 221 </ItemGroup> 211 <ItemGroup> 212 <Folder Include="MultiObjective\" /> 213 <Folder Include="SingleObjective\Interfaces\" /> 214 </ItemGroup> 222 <ItemGroup /> 215 223 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 216 224 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationEvaluator.cs ¶
r5500 r5501 20 20 #endregion 21 21 22 23 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression { 24 public interface ISymbolicRegressionEvaluator : IRegressionEvaluator, ISymbolicDataAnalysisEvaluator { 22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { 23 public interface ISymbolicClassificationEvaluator : IClassificationEvaluator, ISymbolicDataAnalysisEvaluator { 25 24 } 26 25 } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationMultiObjectiveEvaluator.cs ¶
r5500 r5501 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic. Regression {23 public interface ISymbolic RegressionMultiObjectiveEvaluator : ISymbolicRegressionEvaluator, ISymbolicDataAnalysisMultiObjectiveEvaluator {22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { 23 public interface ISymbolicClassificationMultiObjectiveEvaluator : ISymbolicClassificationEvaluator, ISymbolicDataAnalysisMultiObjectiveEvaluator { 24 24 } 25 25 } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationSingleObjectiveEvaluator.cs ¶
r5500 r5501 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic. Regression {23 public interface ISymbolic RegressionSingleObjectiveEvaluator : ISymbolicRegressionEvaluator, ISymbolicDataAnalysisSingleObjectiveEvaluator {22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { 23 public interface ISymbolicClassificationSingleObjectiveEvaluator : ISymbolicClassificationEvaluator, ISymbolicDataAnalysisSingleObjectiveEvaluator { 24 24 } 25 25 } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveEvaluator.cs ¶
r5500 r5501 20 20 #endregion 21 21 22 23 22 using HeuristicLab.Common; 24 23 using 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 25 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { 26 public abstract class SymbolicClassificationMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator, ISymbolicClassificationMultiObjectiveEvaluator { 27 public new IClassificationProblemData ProblemData { 28 get { return (IClassificationProblemData)base.ProblemData; } 29 29 } 30 30 31 31 [StorableConstructor] 32 protected Symbolic RegressionMultiObjectiveEvaluator(bool deserializing) : base(deserializing) { }33 protected Symbolic RegressionMultiObjectiveEvaluator(SymbolicRegressionMultiObjectiveEvaluator original, Cloner cloner)32 protected SymbolicClassificationMultiObjectiveEvaluator(bool deserializing) : base(deserializing) { } 33 protected SymbolicClassificationMultiObjectiveEvaluator(SymbolicClassificationMultiObjectiveEvaluator original, Cloner cloner) 34 34 : base(original, cloner) { 35 35 } 36 36 37 protected Symbolic RegressionMultiObjectiveEvaluator()37 protected SymbolicClassificationMultiObjectiveEvaluator() 38 38 : base() { 39 39 -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveEvaluator.cs ¶
r5500 r5501 20 20 #endregion 21 21 22 23 22 using HeuristicLab.Common; 24 23 using 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 25 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { 26 public abstract class SymbolicClassificationSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator, ISymbolicClassificationSingleObjectiveEvaluator { 27 public new IClassificationProblemData ProblemData { 28 get { return (IClassificationProblemData)base.ProblemData; } 29 29 } 30 30 31 31 [StorableConstructor] 32 protected Symbolic RegressionSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }33 protected Symbolic RegressionSingleObjectiveEvaluator(SymbolicRegressionSingleObjectiveEvaluator original, Cloner cloner)32 protected SymbolicClassificationSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { } 33 protected SymbolicClassificationSingleObjectiveEvaluator(SymbolicClassificationSingleObjectiveEvaluator original, Cloner cloner) 34 34 : base(original, cloner) { 35 35 } 36 36 37 protected Symbolic RegressionSingleObjectiveEvaluator()37 protected SymbolicClassificationSingleObjectiveEvaluator() 38 38 : base() { 39 39 -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs ¶
r5500 r5501 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 28 29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic. Regression {30 [Item("Mean squared error evaluator", "Calculates the mean squared error of a symbolic regression solution.")]29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { 30 [Item("Mean squared error evaluator", "Calculates the mean squared error of a symbolic classification solution.")] 31 31 [StorableClass] 32 public class Symbolic RegressionSingleObjectiveMeanSquaredErrorEvaluator : SymbolicRegressionSingleObjectiveEvaluator {32 public class SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator : SymbolicClassificationSingleObjectiveEvaluator { 33 33 [StorableConstructor] 34 protected Symbolic RegressionSingleObjectiveMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { }35 protected Symbolic RegressionSingleObjectiveMeanSquaredErrorEvaluator(SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator original, Cloner cloner)34 protected SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { } 35 protected SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator original, Cloner cloner) 36 36 : base(original, cloner) { 37 37 } 38 38 public override IDeepCloneable Clone(Cloner cloner) { 39 return new Symbolic RegressionSingleObjectiveMeanSquaredErrorEvaluator(this, cloner);39 return new SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(this, cloner); 40 40 } 41 41 … … 47 47 } 48 48 49 public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, I RegressionProblemData problemData, IEnumerable<int> rows) {49 public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IClassificationProblemData problemData, IEnumerable<int> rows) { 50 50 IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows); 51 51 IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows); -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator.cs ¶
r5500 r5501 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 28 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.")]29 namespace 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.")] 31 31 [StorableClass] 32 public class Symbolic RegressionSingleObjectivePearsonRSquaredEvaluator : SymbolicRegressionSingleObjectiveEvaluator {32 public class SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator : SymbolicClassificationSingleObjectiveEvaluator { 33 33 [StorableConstructor] 34 protected Symbolic RegressionSingleObjectivePearsonRSquaredEvaluator(bool deserializing) : base(deserializing) { }35 protected Symbolic RegressionSingleObjectivePearsonRSquaredEvaluator(SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator original, Cloner cloner)34 protected SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(bool deserializing) : base(deserializing) { } 35 protected SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator original, Cloner cloner) 36 36 : base(original, cloner) { 37 37 } 38 38 public override IDeepCloneable Clone(Cloner cloner) { 39 return new Symbolic RegressionSingleObjectivePearsonRSquaredEvaluator(this, cloner);39 return new SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(this, cloner); 40 40 } 41 41 … … 47 47 } 48 48 49 public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, I RegressionProblemData problemData, IEnumerable<int> rows) {49 public static double Calculate(ISymbolicDataAnalysisTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IClassificationProblemData problemData, IEnumerable<int> rows) { 50 50 IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows); 51 51 IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows); -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/Evaluators/SymbolicRegressionMultiObjectiveEvaluator.cs ¶
r5500 r5501 24 24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 25 25 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression { 26 public abstract class SymbolicRegressionMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator, ISymbolicRegression Evaluator {26 public abstract class SymbolicRegressionMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator, ISymbolicRegressionMultiObjectiveEvaluator { 27 27 public new IRegressionProblemData ProblemData { 28 28 get { return (IRegressionProblemData)base.ProblemData; } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveEvaluator.cs ¶
r5500 r5501 24 24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 25 25 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression { 26 public abstract class SymbolicRegressionSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator, ISymbolicRegression Evaluator {26 public abstract class SymbolicRegressionSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator, ISymbolicRegressionSingleObjectiveEvaluator { 27 27 public new IRegressionProblemData ProblemData { 28 28 get { return (IRegressionProblemData)base.ProblemData; } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs ¶
r5500 r5501 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 28 29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression .SingleObjective.Evaluators{29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression { 30 30 [Item("Pearson R² evaluator", "Calculates the square of the pearson correlation coefficient (also known as coefficient of determination) of a symbolic regression solution.")] 31 31 [StorableClass] -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEvaluator.cs ¶
r5500 r5501 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis .Classification{22 namespace HeuristicLab.Problems.DataAnalysis { 23 23 public interface IClassificationEvaluator : IDataAnalysisEvaluator { 24 24 new IClassificationProblemData ProblemData { get; } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationModel.cs ¶
r5496 r5501 21 21 22 22 using System.Collections.Generic; 23 namespace HeuristicLab.Problems.DataAnalysis .Classification{23 namespace HeuristicLab.Problems.DataAnalysis { 24 24 public interface IClassificationModel : IDataAnalysisModel { 25 25 IEnumerable<double> GetEstimatedValues(IClassificationProblemData problemData, IEnumerable<int> rows); -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblem.cs ¶
r5496 r5501 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis .Classification{22 namespace HeuristicLab.Problems.DataAnalysis { 23 23 public interface IClassificationProblem : IDataAnalysisProblem { 24 24 new IClassificationProblemData ProblemData { get; } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblemData.cs ¶
r5496 r5501 21 21 22 22 using System.Collections.Generic; 23 namespace HeuristicLab.Problems.DataAnalysis .Classification{23 namespace HeuristicLab.Problems.DataAnalysis { 24 24 public interface IClassificationProblemData : IDataAnalysisProblemData { 25 25 string TargetVariable { get; } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolution.cs ¶
r5496 r5501 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis .Classification{22 namespace HeuristicLab.Problems.DataAnalysis { 23 23 public interface IClassificationSolution : IDataAnalysisSolution { 24 24 new IClassificationModel Model { get; } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolutionCreator.cs ¶
r5496 r5501 20 20 #endregion 21 21 22 namespace HeuristicLab.Problems.DataAnalysis .Classification{22 namespace HeuristicLab.Problems.DataAnalysis { 23 23 public interface IClassificationSolutionCreator : IDataAnalysisSolutionCreator { 24 24 } -
TabularUnified branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs ¶
r5500 r5501 21 21 22 22 namespace HeuristicLab.Problems.DataAnalysis { 23 public interface I ClassificationSolution : IDataAnalysisSolution {23 public interface IRegressionnSolution : IDataAnalysisSolution { 24 24 new IRegressionModel Model { get; } 25 25 new IRegressionProblemData ProblemData { get; }
Note: See TracChangeset
for help on using the changeset viewer.