Changeset 2413 for trunk/sources

Timestamp:

10/06/09 10:49:30 (15 years ago)

Author:

gkronber

Message:

Show input variable names, max/min time offset and upper/lower prediction limits in SVMModelView. #772

Location:

trunk/sources/HeuristicLab.SupportVectorMachines/3.2

Files:

• Predictor.cs (modified) (2 diffs)
• PredictorView.cs (modified) (1 diff)
• SVMModelView.cs (modified) (2 diffs)

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

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
+using System.Linq;
 using HeuristicLab.Core;
 using System.Globalization;
@@ -94 +95 @@
 
     public override IEnumerable<string> GetInputVariables() {
-      return variableNames.Keys;
+      return from pair in variableNames
+             orderby pair.Value
+             select pair.Key;
     }
 

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

@@ -41 +41 @@
     public PredictorView(Predictor predictor)
       : base(predictor.Model) {
+      this.predictor = predictor;
       InitializeComponent();
-      this.predictor = predictor;
-      UpdateControls();
       lowerLimitTextbox.DataBindings.Add(new Binding("Text", predictor, "LowerPredictionLimit"));
       upperLimitTextbox.DataBindings.Add(new Binding("Text", predictor, "UpperPredictionLimit"));
       maxTimeOffsetTextBox.DataBindings.Add(new Binding("Text", predictor, "MaxTimeOffset"));
       minTimeOffsetTextBox.DataBindings.Add(new Binding("Text", predictor, "MinTimeOffset"));
+      UpdateControls();
+    }
+
+    protected override string GetModelString() {
+      StringBuilder builder = new StringBuilder();
+      builder.Append("LowerPredictionLimit: ").AppendLine(predictor.LowerPredictionLimit.ToString());
+      builder.Append("UpperPredictionLimit: ").AppendLine(predictor.UpperPredictionLimit.ToString());
+      builder.Append("MaxTimeOffset: ").AppendLine(predictor.MaxTimeOffset.ToString());
+      builder.Append("MinTimeOffset: ").AppendLine(predictor.MinTimeOffset.ToString());
+      builder.Append("InputVariables :");
+      builder.Append(predictor.GetInputVariables().First());
+      foreach (string variable in predictor.GetInputVariables().Skip(1)) {
+        builder.Append("; ").Append(variable);
+      }
+      builder.AppendLine();
+      builder.Append(base.GetModelString());
+      return builder.ToString();
     }
   }

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

@@ -49 +49 @@
       kernelType.DataBindings.Add(new Binding("Text", model.Model.Parameter, "KernelType"));
       gamma.DataBindings.Add(new Binding("Text", model.Model.Parameter, "Gamma"));
+    }
+
+    protected override void UpdateControls() {
+      base.UpdateControls();
+      textBox.Text = GetModelString();
+    }
+
+    protected virtual string GetModelString() {
       StringBuilder builder = new StringBuilder();
       builder.AppendLine("RangeTransform:");
@@ -64 +72 @@
         builder.AppendLine(reader.ReadToEnd());
       }
-
-      textBox.Text = builder.ToString();
+      return builder.ToString();
     }
   }