Context Navigation

Changeset 3855 for trunk/sources

Timestamp:

05/20/10 14:57:11 (15 years ago)

Author:

mkommend

Message:

corrected SVMs in HL3.3 (ticket #1009)

Location:

trunk/sources

Files:

-                      r3853
+                      r3855
       this.textBox.Multiline = true;
       this.textBox.Name = "textBox";
+      this.textBox.ReadOnly = true;
+      this.textBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
       this.textBox.Size = new System.Drawing.Size(247, 245);
       this.textBox.TabIndex = 0;
 …
     private System.Windows.Forms.TextBox textBox;
+  }
+}

r3853	r3855
53	53	}
54	54
	55	protected override void OnContentChanged() {
	56	base.OnContentChanged();
	57	if (Content == null)
	58	textBox.Text = string.Empty;
	59	else
	60	UpdateTextBox();
	61	}
55	62
56		~~#region events~~
57	63	protected override void RegisterContentEvents() {
58	64	base.RegisterContentEvents();
59	65	Content.Changed += new EventHandler(Content_Changed);
60	66	}
61
62	67	protected override void DeregisterContentEvents() {
63	68	base.DeregisterContentEvents();
64	69	Content.Changed -= new EventHandler(Content_Changed);
65	70	}
	71	private void Content_Changed(object sender, EventArgs e) {
	72	UpdateTextBox();
	73	}
66	74
67		private void ~~Content_Changed(object sender, EventArgs e~~) {
	75	private void UpdateTextBox() {
68	76	using (MemoryStream s = new MemoryStream()) {
69	77	SupportVectorMachineModel.Export(Content, s);
…	…
73	81	}
74	82	}
75
76		~~#endregion~~
77	83	}
78	84	}

r3853	r3855
54	54	}
55	55
56
57		#region events
	56	protected override void OnContentChanged() {
	57	base.OnContentChanged();
	58	if (Content != null) {
	59	dataPanel.Content = Content.ProblemData;
	60	modelPanel.Content = Content.Model;
	61	} else {
	62	dataPanel.Content = null;
	63	modelPanel.Content = null;
	64	}
	65	}
58	66	protected override void RegisterContentEvents() {
59	67	base.RegisterContentEvents();
60		Content.ProblemDataChanged += new EventHandler(Content_Changed);
	68	Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
61	69	}
62	70
…	…
65	73	}
66	74
67		private void Content_Changed(object sender, EventArgs e) {
68		modelPanel.Content = Content.Model;
	75	private void Content_ProblemDataChanged(object sender, EventArgs e) {
69	76	dataPanel.Content = Content.ProblemData;
70	77	}
71
72		~~#endregion~~
73	78	}
74	79	}

-                      r3842
+                      r3855
       for (int row = 0; row < rowCount; row++) {
         tempRow = new List<SVM.Node>();
         foreach (var inputVariable in problemData.InputVariables) {
           int col = problemData.Dataset.GetVariableIndex(inputVariable.Value);
+        foreach (var inputVariable in problemData.InputVariables.CheckedItems) {
+          int col = problemData.Dataset.GetVariableIndex(inputVariable.Value.Value);
           double value = problemData.Dataset[start + row, col];
           if (!double.IsNaN(value)) {

Note: See TracChangeset for help on using the changeset viewer.