Context Navigation

HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

03/01/11 12:04:53 (14 years ago)

Author:

mkommend

Message:

#1418: worked on data analysis problem representation.

Location:

Files:

r5574	r5577
125	125	<Compile Include="SymbolicDataAnalysisExpressionTreeInterpreter.cs" />
126	126	<Compile Include="SymbolicDataAnalysisExpressionTreeSimplifier.cs" />
	127	<Compile Include="SymbolicDataAnalysisProblem.cs" />
127	128	<Compile Include="Symbols\Addition.cs" />
128	129	<Compile Include="Symbols\And.cs" />

r5509	r5577
25	25	namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
26	26	public interface ISymbolicDataAnalysisBoundedEvaluator<T> : ISymbolicDataAnalysisEvaluator<T>
27		~~where T : class,~~ IDataAnalysisProblemData {
	27	where T : class,IDataAnalysisProblemData {
28	28	IValueLookupParameter<DoubleValue> UpperEstimationLimitParameter { get; }
29	29	IValueLookupParameter<DoubleValue> LowerEstimationLimitParameter { get; }

-                      r5514
+                      r5577
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Optimization;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public interface ISymbolicDataAnalysisEvaluator<T> : IDataAnalysisEvaluator<T>
    where T : class, IDataAnalysisProblemData {
+  public interface ISymbolicDataAnalysisEvaluator<T> : IEvaluator
+  where T : class,IDataAnalysisProblemData {
     ILookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }
     IValueLookupParameter<IntValue> SamplesStartParameter { get; }
     IValueLookupParameter<IntValue> SamplesEndParameter { get; }
+    IValueLookupParameter<T> ProblemDataParameter { get; }
+    T ProblemData { get; }
+  }
+}

r5509	r5577
26	26	namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
27	27	public interface ISymbolicDataAnalysisMultiObjectiveEvaluator<T> : ISymbolicDataAnalysisEvaluator<T>, IMultiObjectiveEvaluator
28		~~where T : class,~~ IDataAnalysisProblemData {
	28	where T : class,IDataAnalysisProblemData {
29	29	IEnumerable<bool> Maximization { get; }
30	30	}

-                      r5514
+                      r5577
 #endregion
+using HeuristicLab.Optimization;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+  public interface ISymbolicDataAnalysisProblem<T> : IDataAnalysisProblem<T>
+  where T : class, IDataAnalysisProblemData {
+    ISymbolicDataAnalysisGrammar Grammar { get; }
+    new ISymbolicDataAnalysisEvaluator<T> Evaluator { get; }
+    new ISymbolicDataAnalysisSolutionCreator<T> SolutionCreator { get; }
+  public interface ISymbolicDataAnalysisProblem : IDataAnalysisProblem, IProblem {
+    ISymbolicDataAnalysisGrammar SymbolicExpressionTreeGrammar { get; }
+  }
+}

r5509	r5577
24	24	namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
25	25	public interface ISymbolicDataAnalysisSingleObjectiveEvaluator<T> : ISymbolicDataAnalysisEvaluator<T>, ISingleObjectiveEvaluator
26		~~where T : class,~~ IDataAnalysisProblemData {
	26	where T : class,IDataAnalysisProblemData {
27	27	bool Maximization { get; }
28	28	}

-                      r5509
+                      r5577
 #endregion
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Optimization;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+  public interface ISymbolicDataAnalysisSolutionCreator<T> : ISymbolicExpressionTreeCreator, IDataAnalysisSolutionCreator<T>
+  where T : class, IDataAnalysisProblemData {
+  public interface ISymbolicDataAnalysisSolutionCreator : ISymbolicExpressionTreeCreator, ISolutionCreator {
+    IParameter ProblemDataParameter { get; }
+    IDataAnalysisProblemData ProblemData { get; }
+  }
+}

-                      r5553
+                      r5577
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Optimization;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+  public interface ISymbolicDataAnalysisValidatingAnalyzer<T> : ISymbolicDataAnalysisAnalyzer where T : class, IDataAnalysisProblemData {
+    ILookupParameter<ISymbolicDataAnalysisEvaluator<T>> EvaluatorParameter { get; }
+  public interface ISymbolicDataAnalysisValidatingAnalyzer<T, U> : ISymbolicDataAnalysisAnalyzer
+    where T : class,ISymbolicDataAnalysisEvaluator<U>
+    where U : class, IDataAnalysisProblemData {
+    ILookupParameter<T> EvaluatorParameter { get; }
     IValueLookupParameter<IntValue> ValidationSamplesStartParameter { get; }
     IValueLookupParameter<IntValue> ValidationSamplesEndParameter { get; }

Note: See TracChangeset for help on using the changeset viewer.