Context Navigation

Changeset 5580

Timestamp:

03/01/11 15:07:18 (13 years ago)

Author:

mkommend

Message:

#1418: Added single and multi-objective SymbolicDataAnalysisProblem classes and adapted generic type parameter.

Location:

Files:

r5574	r5580
29	29	[StorableClass]
30	30	[Item("ArithmeticExpressionGrammar", "Represents a grammar for functional expressions using only arithmetic operations.")]
31		public class ArithmeticExpressionGrammar : DefaultSymbolicExpressionGrammar {
	31	public class ArithmeticExpressionGrammar : DefaultSymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
32	32
33	33	[StorableConstructor]

r5574	r5580
29	29	[StorableClass]
30	30	[Item("FullFunctionalExpressionGrammar", "Represents a grammar for functional expressions using all available functions.")]
31		public class FullFunctionalExpressionGrammar : DefaultSymbolicExpressionGrammar {
	31	public class FullFunctionalExpressionGrammar : DefaultSymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
32	32	[StorableConstructor]
33	33	protected FullFunctionalExpressionGrammar(bool deserializing) : base(deserializing) { }

r5574	r5580
29	29	[StorableClass]
30	30	[Item("TypeCoherentExpressionGrammar", "Represents a grammar for functional expressions in which special syntactic constraints are enforced so that boolean and real-valued expressions are not mixed.")]
31		public class TypeCoherentExpressionGrammar : DefaultSymbolicExpressionGrammar {
	31	public class TypeCoherentExpressionGrammar : DefaultSymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
32	32
33	33	[StorableConstructor]

-                      r5577
+                      r5580
     </Compile>
     <Compile Include="Analyzers\SymbolicDataAnalysisVariableFrequencyAnalyzer.cs" />
+    <Compile Include="MultiObjectiveSymbolicDataAnalysisProblem.cs" />
     <Compile Include="Grammars\ArithmeticExpressionGrammar.cs" />
     <Compile Include="Grammars\FullFunctionalExpressionGrammar.cs" />
 …
     <Compile Include="Interfaces\ISymbolicDataAnalysisValidatingAnalyzer.cs" />
     <Compile Include="Interfaces\ISymbolicDataAnalysisAnalyzer.cs" />
+    <Compile Include="SingleObjectiveSymbolicDataAnalysisProblem.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeInterpreter.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeSimplifier.cs" />

-                      r5578
+                      r5580
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-// TODO add evaluator and solution creator parameter
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
   public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<V, U>, ISymbolicDataAnalysisProblem, IStorableContent
+  public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, ISymbolicDataAnalysisProblem, IStorableContent
     where T : class,IDataAnalysisProblemData
     where U : class, ISymbolicDataAnalysisSolutionCreator
     where V : class, ISymbolicDataAnalysisEvaluator<T> {
+    where U : class, ISymbolicDataAnalysisEvaluator<T>
+    where V : class, ISymbolicDataAnalysisSolutionCreator {
     #region parameter names & descriptions
     private const string ProblemDataParameterName = "ProblemData";
 …
     private const string MaximumFunctionArgumentsParameterDescription = "Maximal number of arguments of automatically defined functions.";
     #endregion
     #region parameter properties

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