Changeset 16921 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

05/08/19 13:57:25 (5 years ago)

Author:

chaider

Message:

#2971

• Changed getInterval method to return Interval instead of KeyValuePair
• Calling getMethods from IntervalsCollection

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs (modified) (4 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs

@@ -69 +69 @@
 
 
-      var variablesCount = Content.VariableIntervals.Count;
+      var variablesCount = Content.getIntervals().Count;
 
       DataGridViewRow[] rows = new DataGridViewRow[variablesCount];
@@ -93 +93 @@
       for (var i = 0; i < dataGridView.RowCount; ++i) {
         var key = (string)dataGridView.Rows[i].HeaderCell.Value;
-        dataGridView.Rows[i].Cells[0].Value = Content.VariableIntervals[key].LowerBound;
-        dataGridView.Rows[i].Cells[1].Value = Content.VariableIntervals[key].UpperBound;
+        dataGridView.Rows[i].Cells[0].Value = Content.getInterval(key).LowerBound;
+        dataGridView.Rows[i].Cells[1].Value = Content.getInterval(key).UpperBound;
       }
     }
 
     private void SetRowsHeader() {
-      for (var i = 0; i < Content.VariableIntervals.Count; ++i) {
-        var item = Content.VariableIntervals.ElementAt(i);
+      for (var i = 0; i < Content.getIntervals().Count; ++i) {
+        var item = Content.getIntervals().ElementAt(i);
         dataGridView.Rows[i].HeaderCell.Value = item.Key;
       }
@@ -115 +115 @@
       if (e.ColumnIndex < 0 || e.RowIndex < 0) return;
 
-      var lowerBound = e.ColumnIndex == 0 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.VariableIntervals[key].LowerBound;
-      var upperBound = e.ColumnIndex == 1 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.VariableIntervals[key].UpperBound;
+      var lowerBound = e.ColumnIndex == 0 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.getInterval(key).LowerBound;
+      var upperBound = e.ColumnIndex == 1 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.getInterval(key).UpperBound;
 
       // update if there was a change
-      if (lowerBound != Content.VariableIntervals[key].LowerBound ||
-        upperBound != Content.VariableIntervals[key].UpperBound)
+      if (lowerBound != Content.getInterval(key).LowerBound ||
+        upperBound != Content.getInterval(key).UpperBound)
         Content.VariableIntervals[key] = new Interval(lowerBound, upperBound);
     }
@@ -129 +129 @@
         dataGridView.Rows[e.RowIndex].ErrorText = "Value must be a double value.";
         return;
-      }/* else if (string.IsNullOrEmpty(dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString()) ||
-        string.IsNullOrEmpty(dataGridView.Rows[e.RowIndex].Cells[1].Value.ToString())) {
-        // accept any value if one of the cells is still empty
-      } */else {
+      } else {
         var lowerBound = double.Parse(dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString());
         var upperBound = double.Parse(dataGridView.Rows[e.RowIndex].Cells[1].Value.ToString());