Changeset 2351 for trunk/sources/HeuristicLab.SupportVectorMachines

Timestamp:

09/14/09 17:30:02 (15 years ago)

Author:

gkronber

Message:

Worked on SVM classification engine. #625

Location:

trunk/sources/HeuristicLab.SupportVectorMachines/3.2

Files:

• HeuristicLab.SupportVectorMachines-3.2.csproj (modified) (1 diff)
• SupportVectorClassification.cs (copied) (copied from trunk/sources/HeuristicLab.SupportVectorMachines/3.2/TimeSeriesSupportVectorRegression.cs) (3 diffs)
• SupportVectorRegression.cs (modified) (1 diff)

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/HeuristicLab.SupportVectorMachines-3.2.csproj

@@ -83 +83 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SupportVectorClassification.cs" />
     <Compile Include="TimeSeriesSupportVectorRegression.cs" />
     <Compile Include="PredictorView.cs">

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorClassification.cs

@@ -37 +37 @@
 
 namespace HeuristicLab.SupportVectorMachines {
-  public class TimeSeriesSupportVectorRegression : SupportVectorRegression {
+  public class SupportVectorClassification : SupportVectorRegression {
 
-    public override string Name { get { return "SupportVectorRegression - Time Series Prognosis"; } }
+    public override string Name { get { return "SupportVectorClassification"; } }
 
-    public int MaxTimeOffset {
-      get { return GetVariableInjector().GetVariable("MaxTimeOffset").GetValue<IntData>().Data; }
-      set { GetVariableInjector().GetVariable("MaxTimeOffset").GetValue<IntData>().Data = value; }
-    }
-
-    public int MinTimeOffset {
-      get { return GetVariableInjector().GetVariable("MinTimeOffset").GetValue<IntData>().Data; }
-      set { GetVariableInjector().GetVariable("MinTimeOffset").GetValue<IntData>().Data = value; }
-    }
-
-    public TimeSeriesSupportVectorRegression()
+    public SupportVectorClassification()
       : base() {
-      MaxTimeOffset = 0;
-      MinTimeOffset = 0;
-    }
-
-    protected override IOperator CreateInitialization() {
-      SequentialProcessor seq = new SequentialProcessor();
-      seq.Name = "Initialization";
-      seq.AddSubOperator(CreateGlobalInjector());
-      ProblemInjector probInjector = new ProblemInjector();
-      seq.AddSubOperator(probInjector);
-      seq.AddSubOperator(new RandomInjector());
-
-      return seq;
-    }
-
-    protected override VariableInjector CreateGlobalInjector() {
-      VariableInjector injector = base.CreateGlobalInjector();
-      injector.AddVariable(new HeuristicLab.Core.Variable("MaxTimeOffset", new IntData()));
-      injector.AddVariable(new HeuristicLab.Core.Variable("MinTimeOffset", new IntData()));
-      return injector;
+      SvmType = "NU_SVC";
+      CostList = new DoubleArrayData(new double[] { 1.0 });
+      MaxCostIndex = 1;
     }
 
@@ -83 +56 @@
       SequentialProcessor seqProc = new SequentialProcessor();
 
-      SimpleTheilInequalityCoefficientEvaluator trainingTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
-      trainingTheilUCalculator.GetVariableInfo("Values").ActualName = "TrainingValues";
-      trainingTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
-      SimpleTheilInequalityCoefficientEvaluator validationTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
-      validationTheilUCalculator.GetVariableInfo("Values").ActualName = "ValidationValues";
-      validationTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
-      SimpleTheilInequalityCoefficientEvaluator testTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
-      testTheilUCalculator.GetVariableInfo("Values").ActualName = "TestValues";
-      testTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
+      SupportVectorEvaluator trainingEvaluator = new SupportVectorEvaluator();
+      trainingEvaluator.Name = "TrainingSimpleEvaluator";
+      trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
+      trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingEvaluator.GetVariableInfo("Values").ActualName = "TrainingValues";
 
-      seqProc.AddSubOperator(trainingTheilUCalculator);
-      seqProc.AddSubOperator(validationTheilUCalculator);
-      seqProc.AddSubOperator(testTheilUCalculator);
+      SimpleAccuracyEvaluator trainingAccuracyEvaluator = new SimpleAccuracyEvaluator();
+      trainingAccuracyEvaluator.Name = "TrainingAccuracyEvaluator";
+      trainingAccuracyEvaluator.GetVariableInfo("Values").ActualName = "TrainingValues";
+      trainingAccuracyEvaluator.GetVariableInfo("Accuracy").ActualName = "TrainingAccuracy";
+      SimpleAccuracyEvaluator validationAccuracyEvaluator = new SimpleAccuracyEvaluator();
+      validationAccuracyEvaluator.Name = "ValidationAccuracyEvaluator";
+      validationAccuracyEvaluator.GetVariableInfo("Values").ActualName = "ValidationValues";
+      validationAccuracyEvaluator.GetVariableInfo("Accuracy").ActualName = "ValidationAccuracy";
+      SimpleAccuracyEvaluator testAccuracyEvaluator = new SimpleAccuracyEvaluator();
+      testAccuracyEvaluator.Name = "TestAccuracyEvaluator";
+      testAccuracyEvaluator.GetVariableInfo("Values").ActualName = "TestValues";
+      testAccuracyEvaluator.GetVariableInfo("Accuracy").ActualName = "TestAccuracy";
+
+      SimpleConfusionMatrixEvaluator trainingConfusionMatrixEvaluator = new SimpleConfusionMatrixEvaluator();
+      trainingConfusionMatrixEvaluator.Name = "TrainingConfusionMatrixEvaluator";
+      trainingConfusionMatrixEvaluator.GetVariableInfo("Values").ActualName = "TrainingValues";
+      trainingConfusionMatrixEvaluator.GetVariableInfo("ConfusionMatrix").ActualName = "TrainingConfusionMatrix";
+      SimpleConfusionMatrixEvaluator validationConfusionMatrixEvaluator = new SimpleConfusionMatrixEvaluator();
+      validationConfusionMatrixEvaluator.Name = "ValidationConfusionMatrixEvaluator";
+      validationConfusionMatrixEvaluator.GetVariableInfo("Values").ActualName = "ValidationValues";
+      validationConfusionMatrixEvaluator.GetVariableInfo("ConfusionMatrix").ActualName = "ValidationConfusionMatrix";
+      SimpleConfusionMatrixEvaluator testConfusionMatrixEvaluator = new SimpleConfusionMatrixEvaluator();
+      testConfusionMatrixEvaluator.Name = "TestConfusionMatrixEvaluator";
+      testConfusionMatrixEvaluator.GetVariableInfo("Values").ActualName = "TestValues";
+      testConfusionMatrixEvaluator.GetVariableInfo("ConfusionMatrix").ActualName = "TestConfusionMatrix";
+
+      seqProc.AddSubOperator(trainingEvaluator);
+      seqProc.AddSubOperator(trainingAccuracyEvaluator);
+      seqProc.AddSubOperator(validationAccuracyEvaluator);
+      seqProc.AddSubOperator(testAccuracyEvaluator);
+      seqProc.AddSubOperator(trainingConfusionMatrixEvaluator);
+      seqProc.AddSubOperator(validationConfusionMatrixEvaluator);
+      seqProc.AddSubOperator(testConfusionMatrixEvaluator);
 
       seq.AddSubOperator(seqSubScopeProc);
@@ -109 +108 @@
       IAnalyzerModel model = base.CreateSVMModel(bestModelScope);
 
-      model.SetResult("TrainingTheilInequalityCoefficient", bestModelScope.GetVariableValue<DoubleData>("TrainingTheilInequalityCoefficient", false).Data);
-      model.SetResult("ValidationTheilInequalityCoefficient", bestModelScope.GetVariableValue<DoubleData>("ValidationTheilInequalityCoefficient", false).Data);
-      model.SetResult("TestTheilInequalityCoefficient", bestModelScope.GetVariableValue<DoubleData>("TestTheilInequalityCoefficient", false).Data);
+      model.SetResult("TrainingAccuracy", bestModelScope.GetVariableValue<DoubleData>("TrainingAccuracy", false).Data);
+      model.SetResult("ValidationAccuracy", bestModelScope.GetVariableValue<DoubleData>("ValidationAccuracy", false).Data);
+      model.SetResult("TestAccuracy", bestModelScope.GetVariableValue<DoubleData>("TestAccuracy", false).Data);
 
       return model;

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs

@@ -105 +105 @@
       get { return GetVariableInjector().GetVariable("MaxGammaIndex").GetValue<IntData>().Data; }
       set { GetVariableInjector().GetVariable("MaxGammaIndex").GetValue<IntData>().Data = value; }
+    }
+
+    public string SvmType {
+      get { return GetVariableInjector().GetVariable("Type").GetValue<StringData>().Data; }
+      set { GetVariableInjector().GetVariable("Type").GetValue<StringData>().Data = value; }
     }