Changeset 5275 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/ParameterAdjustmentProblem

Timestamp:

01/11/11 15:03:46 (14 years ago)

Author:

gkronber

Message:

Merged changes from trunk to data analysis exploration branch and added fractional distance metric evaluator. #1142

Location:

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/ParameterAdjustmentProblem

Files:

• SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer.cs (modified) (5 diffs)
• SupportVectorMachineParameterAdjustmentEvaluator.cs (modified) (3 diffs)
• SupportVectorMachineParameterAdjustmentProblem.cs (modified) (2 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/ParameterAdjustmentProblem/SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer.cs

@@ -30 +30 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis.Evaluators;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.SupportVectorMachine.ParameterAdjustmentProblem {
@@ -89 +90 @@
 
     #endregion
-
+    [StorableConstructor]
+    protected SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    protected SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer(SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer()
       : base() {
@@ -103 +108 @@
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The result collection where the best support vector solution should be stored."));
     }
-
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SupportVectorMachineParameterAdjustmentBestSolutionAnalyzer(this, cloner);
+    }
     public override IOperation Apply() {
       var points = ParameterVectorParameter.ActualValue;
@@ -124 +131 @@
       if (bestModel == null) {
         bestModel = SupportVectorMachineModelCreator.TrainModel(DataAnalysisProblemData,
-          DataAnalysisProblemData.TrainingSamplesStart.Value, DataAnalysisProblemData.TrainingSamplesEnd.Value,
+          DataAnalysisProblemData.TrainingIndizes,
           SvmType.Value, KernelType.Value, cost, nu, gamma, 0.0);
         BestSolutionParameter.ActualValue = bestModel;
@@ -153 +160 @@
         if (BestSolutionQualityParameter.ActualValue.Value > bestQuality) {
           bestModel = SupportVectorMachineModelCreator.TrainModel(DataAnalysisProblemData,
-            DataAnalysisProblemData.TrainingSamplesStart.Value, DataAnalysisProblemData.TrainingSamplesEnd.Value,
+            DataAnalysisProblemData.TrainingIndizes,
             SvmType.Value, KernelType.Value, cost, nu, gamma, 0.0);
           BestSolutionParameter.ActualValue = bestModel;

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/ParameterAdjustmentProblem/SupportVectorMachineParameterAdjustmentEvaluator.cs

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.SupportVectorMachine.ParameterAdjustmentProblem {
@@ -107 +108 @@
     }
     #endregion
-
+    [StorableConstructor]
+    protected SupportVectorMachineParameterAdjustmentEvaluator(bool deserializing) : base(deserializing) { }
+    protected SupportVectorMachineParameterAdjustmentEvaluator(SupportVectorMachineParameterAdjustmentEvaluator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public SupportVectorMachineParameterAdjustmentEvaluator()
       : base() {
@@ -130 +135 @@
       evaluator.Successor = null;
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SupportVectorMachineParameterAdjustmentEvaluator(this, cloner);
+    }
 
     public override IOperation Apply() {

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/ParameterAdjustmentProblem/SupportVectorMachineParameterAdjustmentProblem.cs

@@ -130 +130 @@
     [StorableConstructor]
     private SupportVectorMachineParameterAdjustmentProblem(bool deserializing) : base(deserializing) { }
+    private SupportVectorMachineParameterAdjustmentProblem(SupportVectorMachineParameterAdjustmentProblem original, Cloner cloner)
+      : base(original, cloner) {
+      operators = original.operators.Where(x => IsNotFieldReferenced(x)).Select(x => (IOperator)cloner.Clone(x)).ToList();
+      strategyVectorCreator = (StdDevStrategyVectorCreator)cloner.Clone(original.strategyVectorCreator);
+      operators.Add(strategyVectorCreator);
+      strategyVectorCrossover = (StdDevStrategyVectorCrossover)cloner.Clone(original.strategyVectorCrossover);
+      operators.Add(strategyVectorCrossover);
+      strategyVectorManipulator = (StdDevStrategyVectorManipulator)cloner.Clone(original.strategyVectorManipulator);
+      operators.Add(strategyVectorManipulator);
+      AttachEventHandlers();
+    }
     public SupportVectorMachineParameterAdjustmentProblem()
       : base() {
@@ -167 +178 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      SupportVectorMachineParameterAdjustmentProblem clone = (SupportVectorMachineParameterAdjustmentProblem)base.Clone(cloner);
-      clone.operators = operators.Where(x => IsNotFieldReferenced(x)).Select(x => (IOperator)cloner.Clone(x)).ToList();
-      clone.strategyVectorCreator = (StdDevStrategyVectorCreator)cloner.Clone(strategyVectorCreator);
-      clone.operators.Add(clone.strategyVectorCreator);
-      clone.strategyVectorCrossover = (StdDevStrategyVectorCrossover)cloner.Clone(strategyVectorCrossover);
-      clone.operators.Add(strategyVectorCrossover);
-      clone.strategyVectorManipulator = (StdDevStrategyVectorManipulator)cloner.Clone(strategyVectorManipulator);
-      clone.operators.Add(strategyVectorManipulator);
-      clone.AttachEventHandlers();
-      return clone;
-    }
-
+      return new SupportVectorMachineParameterAdjustmentProblem(this, cloner);
+    }
     private bool IsNotFieldReferenced(IOperator x) {
       return !(x == strategyVectorCreator