Changeset 3892 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3

Timestamp:

06/02/10 19:10:35 (14 years ago)

Author:

gkronber

Message:

Improved code for analyzers for SVR and symbolic regression. #1009

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3

Files:

• Dataset.cs (modified) (1 diff)
• SupportVectorMachine/ParameterAdjustmentProblem/SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs

@@ -231 +231 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Dataset clone = (Dataset)base.Clone(cloner);
-      clone.data = data;
+      clone.data = (double[,])data.Clone();
       clone.variableNames = (string[])variableNames.Clone();
       return clone;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/ParameterAdjustmentProblem/SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer.cs

@@ -81 +81 @@
       get { return KernelTypeParameter.Value; }
     }
-    public ILookupParameter<SupportVectorMachineModel> BestSolutionParameter {
-      get { return (ILookupParameter<SupportVectorMachineModel>)Parameters[BestSolutionParameterName]; }
+    public ILookupParameter<DataAnalysisSolution> BestSolutionParameter {
+      get { return (ILookupParameter<DataAnalysisSolution>)Parameters[BestSolutionParameterName]; }
     }
     public ILookupParameter<DoubleValue> BestSolutionQualityParameter {
@@ -102 +102 @@
       Parameters.Add(new ValueLookupParameter<StringValue>(KernelTypeParameterName, "The kernel type to use for the SVM.", rbfKernelType));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName, "The cross validation quality reached with the given parameters."));
-      Parameters.Add(new LookupParameter<SupportVectorMachineModel>(BestSolutionParameterName, "The best support vector solution."));
+      Parameters.Add(new LookupParameter<DataAnalysisSolution>(BestSolutionParameterName, "The best support vector solution."));
       Parameters.Add(new LookupParameter<DoubleValue>(BestSolutionQualityParameterName, "The quality of the best support vector model."));
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The result collection where the best support vector solution should be stored."));
@@ -124 +124 @@
       DataAnalysisProblemData problemData = DataAnalysisProblemData;
 
-      SupportVectorMachineModel bestModel = BestSolutionParameter.ActualValue;
+      DataAnalysisSolution bestSolution = BestSolutionParameter.ActualValue;
       if (bestModel == null) {
         bestModel = SupportVectorMachineModelCreator.TrainModel(DataAnalysisProblemData,