Changeset 9126 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces

Timestamp:

01/08/13 15:36:13 (12 years ago)

Author:

mkommend

Message:

#1837: Updated sliding window GP branch with trunk changes.

Location:

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4 (modified) (1 prop)
• 3.4/Interfaces/ISymbolicDataAnalysisEvaluator.cs (modified) (1 diff)
• 3.4/Interfaces/ISymbolicDataAnalysisImpactValuesCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisImpactValuesCalculator.cs)
• 3.4/Interfaces/ISymbolicDataAnalysisMultiObjectiveAnalyzer.cs (modified) (1 diff)
• 3.4/Interfaces/ISymbolicDataAnalysisProblem.cs (modified) (2 diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisSingleObjectiveAnalyzer.cs (modified) (1 diff)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

@@ +1 @@
+*.user
+Plugin.cs
 bin
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
 obj
-*.vs10x
-Plugin.cs

@@ +1 @@
+*.user
+Plugin.cs
 bin
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
 obj
-*.vs10x
-Plugin.cs

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisEvaluator.cs

@@ -29 +29 @@
     IValueLookupParameter<IntRange> EvaluationPartitionParameter { get; }
     IValueLookupParameter<PercentValue> RelativeNumberOfEvaluatedSamplesParameter { get; }
+    ILookupParameter<BoolValue> ApplyLinearScalingParameter { get; }
 
     IValueLookupParameter<T> ProblemDataParameter { get; }

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisMultiObjectiveAnalyzer.cs

@@ -21 +21 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public interface ISymbolicDataAnalysisMultiObjectiveAnalyzer : ISymbolicDataAnalysisAnalyzer {
     IScopeTreeLookupParameter<DoubleArray> QualitiesParameter { get; }
     ILookupParameter<BoolArray> MaximizationParameter { get; }
+    ILookupParameter<BoolValue> ApplyLinearScalingParameter { get; }
 
   }

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisProblem.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  public interface ISymbolicDataAnalysisProblem : IDataAnalysisProblem {
+  public interface ISymbolicDataAnalysisProblem : IDataAnalysisProblem, IHeuristicOptimizationProblem {
     IValueParameter<ISymbolicDataAnalysisGrammar> SymbolicExpressionTreeGrammarParameter { get; }
     IValueParameter<ISymbolicDataAnalysisExpressionTreeInterpreter> SymbolicExpressionTreeInterpreterParameter { get; }
@@ -45 +46 @@
     IntRange ValidationPartition { get; }
   }
+
+  public interface ISymbolicDataAnalysisSingleObjectiveProblem : ISymbolicDataAnalysisProblem, ISingleObjectiveHeuristicOptimizationProblem { }
+  public interface ISymbolicDataAnalysisMultiObjectiveProblem : ISymbolicDataAnalysisProblem, IMultiObjectiveHeuristicOptimizationProblem { }
 }

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisSingleObjectiveAnalyzer.cs

@@ -28 +28 @@
     IScopeTreeLookupParameter<DoubleValue> QualityParameter { get; }
     ILookupParameter<BoolValue> MaximizationParameter { get; }
+    ILookupParameter<BoolValue> ApplyLinearScalingParameter { get; }
   }
 }

@@ +1 @@
+*.user
+Plugin.cs
 bin
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
 obj
-*.vs10x
-Plugin.cs