Changeset 5883 for trunk

Timestamp:

03/30/11 13:38:01 (13 years ago)

Author:

mkommend

Message:

#1418: Adapted interfaces of data analysis classes.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisProblem.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisSolution.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -124 +124 @@
     <Compile Include="Interfaces\ISymbolicDataAnalysisBoundedOperator.cs" />
     <Compile Include="Interfaces\ISymbolicDataAnalysisExpressionTreeInterpreter.cs" />
+    <Compile Include="Interfaces\ISymbolicDataAnalysisProblem.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeCreator.cs" />
     <Compile Include="SymbolicDataAnalysisModel.cs">

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -35 +35 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem, IStorableContent
+  public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>, ISymbolicDataAnalysisProblem, IStorableContent
     where T : class,IDataAnalysisProblemData
     where U : class, ISymbolicDataAnalysisEvaluator<T>
@@ -95 +95 @@
       get { return (IFixedValueParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; }
     }
-    public IFixedValueParameter<IntRange> ValidationPartitionParamater {
+    public IFixedValueParameter<IntRange> ValidationPartitionParameter {
       get { return (IFixedValueParameter<IntRange>)Parameters[ValidationPartitionParameterName]; }
     }
@@ -141 +141 @@
     }
     public IntRange ValidationPartition {
-      get { return ValidationPartitionParamater.Value; }
+      get { return ValidationPartitionParameter.Value; }
     }
     #endregion
@@ -297 +297 @@
       foreach (var op in operators.OfType<ISymbolicDataAnalysisValidationAnalyzer<U, T>>()) {
         op.RelativeNumberOfEvaluatedSamplesParameter.ActualName = RelativeNumberOfEvaluatedSamplesParameter.Name;
-        op.ValidationPartitionParameter.ActualName = ValidationPartitionParamater.Name;
+        op.ValidationPartitionParameter.ActualName = ValidationPartitionParameter.Name;
       }
       foreach (var op in operators.OfType<ISymbolicDataAnalysisInterpreterOperator>()) {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public interface IDataAnalysisProblemData : IParameterizedNamedItem {
+  public interface IDataAnalysisProblemData : INamedItem {
     Dataset Dataset { get; }
     ICheckedItemList<StringValue> InputVariables { get; }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisSolution.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public interface IDataAnalysisSolution : INamedItem, IKeyedItemCollection<string, IResult> {
+  public interface IDataAnalysisSolution : INamedItem {
     IDataAnalysisModel Model { get; }
     IDataAnalysisProblemData ProblemData { get; }