Changeset 1889

Timestamp:

05/25/09 16:37:40 (16 years ago)

Author:

gkronber

Message:

Added calculation of MAPE, MAPRE, VAF to hard-coded SVM algorithm. #624 (Algorithm for support vector regression)

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs (modified) (4 diffs)

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

@@ -129 +129 @@
       modelCreator.GetVariableInfo("SVMRangeTransform").ActualName = "RangeTransform";
       modelCreator.GetVariableInfo("SVMType").ActualName = "Type";
-      
+
 
       modelProcessor.AddSubOperator(modelCreator);
@@ -192 +192 @@
       op.Name = p + "Evaluator";
       SequentialProcessor seqProc = new SequentialProcessor();
-     
+
       SupportVectorEvaluator evaluator = new SupportVectorEvaluator();
       evaluator.Name = p + "SimpleEvaluator";
@@ -208 +208 @@
       r2Evaluator.GetVariableInfo("Values").ActualName = p + "Values";
       r2Evaluator.GetVariableInfo("R2").ActualName = p + "R2";
+      SimpleMeanAbsolutePercentageErrorEvaluator mapeEvaluator = new SimpleMeanAbsolutePercentageErrorEvaluator();
+      mapeEvaluator.Name = p + "MAPEEvaluator";
+      mapeEvaluator.GetVariableInfo("Values").ActualName = p + "Values";
+      mapeEvaluator.GetVariableInfo("MAPE").ActualName = p + "MAPE";
+      SimpleMeanAbsolutePercentageOfRangeErrorEvaluator mapreEvaluator = new SimpleMeanAbsolutePercentageOfRangeErrorEvaluator();
+      mapreEvaluator.Name = p + "MAPREEvaluator";
+      mapreEvaluator.GetVariableInfo("Values").ActualName = p + "Values";
+      mapreEvaluator.GetVariableInfo("MAPRE").ActualName = p + "MAPRE";
+      SimpleVarianceAccountedForEvaluator vafEvaluator = new SimpleVarianceAccountedForEvaluator();
+      vafEvaluator.Name = p + "VAFEvaluator";
+      vafEvaluator.GetVariableInfo("Values").ActualName = p + "Values";
+      vafEvaluator.GetVariableInfo("VAF").ActualName = p + "VAF";
 
       seqProc.AddSubOperator(evaluator);
       seqProc.AddSubOperator(mseEvaluator);
       seqProc.AddSubOperator(r2Evaluator);
+      seqProc.AddSubOperator(mapeEvaluator);
+      seqProc.AddSubOperator(mapreEvaluator);
+      seqProc.AddSubOperator(vafEvaluator);
 
       op.OperatorGraph.AddOperator(seqProc);
@@ -241 +256 @@
       progOp.RemoveVariableInfo("Result");
       progOp.AddVariableInfo(new VariableInfo("Value", "Value", typeof(IntData), VariableKind.In | VariableKind.Out));
-      progOp.Code ="Value.Data = 0;";
+      progOp.Code = "Value.Data = 0;";
       progOp.GetVariableInfo("Value").ActualName = paramName;
       return progOp;