Changeset 343

Timestamp:

06/26/08 13:19:05 (16 years ago)

Author:

gkronber

Message:

fixed serialization and display of floating point number in plugin HeuristicLab.Data (ticket #175). Had to make the dataGridView in ArrayDataBaseView and MatrixDataBaseView to protected to be able to change the format of cells in DoubleArrayDataView and DoubleMatrixDataView.

Location:

branches/Ticket175Branch/HeuristicLab.Data

Files:

• ArrayDataBaseView.Designer.cs (modified) (1 diff)
• ArrayDataBaseView.cs (modified) (1 diff)
• ConstrainedDoubleDataView.cs (modified) (1 diff)
• DoubleArrayData.cs (modified) (1 diff)
• DoubleArrayDataView.cs (modified) (1 diff)
• DoubleData.cs (modified) (1 diff)
• DoubleDataView.cs (modified) (1 diff)
• DoubleMatrixData.cs (modified) (1 diff)
• DoubleMatrixDataView.cs (modified) (1 diff)
• MatrixDataBaseView.Designer.cs (modified) (1 diff)

branches/Ticket175Branch/HeuristicLab.Data/ArrayDataBaseView.Designer.cs

@@ -105 +105 @@
     private System.Windows.Forms.Label sizeLabel;
     private System.Windows.Forms.TextBox lengthTextBox;
-    private System.Windows.Forms.DataGridView dataGridView;
+    protected System.Windows.Forms.DataGridView dataGridView;
   }
 }

branches/Ticket175Branch/HeuristicLab.Data/ArrayDataBaseView.cs

@@ -64 +64 @@
         dataGridView.RowCount = length;
         for (int i = 0; i < length; i++) {
-          dataGridView.Rows[i].Cells[0].Value = ArrayDataBase.Data.GetValue(i); ;
+          dataGridView.Rows[i].Cells[0].Value = ArrayDataBase.Data.GetValue(i);
         }
       } else {

branches/Ticket175Branch/HeuristicLab.Data/ConstrainedDoubleDataView.cs

@@ -62 +62 @@
       } else {
         dataTextBox.Enabled = true;
-        dataTextBox.Text = ConstrainedDoubleData.ToString();
+        dataTextBox.Text = ConstrainedDoubleData.Data.ToString("r");
       }
     }

branches/Ticket175Branch/HeuristicLab.Data/DoubleArrayData.cs

@@ -65 +65 @@
       for(int i = 0; i < Data.Length; i++) {
         builder.Append(";");
-        builder.Append(Data[i].ToString(format));
+        builder.Append(Data[i].ToString("r", format));
       }
       if(builder.Length > 0)

branches/Ticket175Branch/HeuristicLab.Data/DoubleArrayDataView.cs

@@ -37 +37 @@
     public DoubleArrayDataView() {
       InitializeComponent();
+      // round-trip format for all cells
+      dataGridView.DefaultCellStyle.Format = "r";
     }
     public DoubleArrayDataView(DoubleArrayData doubleArrayData)

branches/Ticket175Branch/HeuristicLab.Data/DoubleData.cs

@@ -54 +54 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      node.InnerText = Data.ToString(CultureInfo.InvariantCulture.NumberFormat);
+      node.InnerText = Data.ToString("r", CultureInfo.InvariantCulture.NumberFormat);
       return node;
     }

branches/Ticket175Branch/HeuristicLab.Data/DoubleDataView.cs

@@ -59 +59 @@
       } else {
         dataTextBox.Enabled = true;
-        dataTextBox.Text = DoubleData.ToString();
+        dataTextBox.Text = DoubleData.Data.ToString("r");
       }
     }

branches/Ticket175Branch/HeuristicLab.Data/DoubleMatrixData.cs

@@ -81 +81 @@
         for (int j = 0; j < Data.GetLength(1); j++) {
           builder.Append(";");
-          builder.Append(Data[i, j].ToString(format));
+          builder.Append(Data[i, j].ToString("r", format));
         }
       }

branches/Ticket175Branch/HeuristicLab.Data/DoubleMatrixDataView.cs

@@ -37 +37 @@
     public DoubleMatrixDataView() {
       InitializeComponent();
+      // round-trip format for all cells
+      dataGridView.DefaultCellStyle.Format = "r";
     }
     public DoubleMatrixDataView(DoubleMatrixData doubleMatrixData)

branches/Ticket175Branch/HeuristicLab.Data/MatrixDataBaseView.Designer.cs

@@ -132 +132 @@
     private System.Windows.Forms.Label rowsLabel;
     private System.Windows.Forms.TextBox rowsTextBox;
-    private System.Windows.Forms.DataGridView dataGridView;
+    protected System.Windows.Forms.DataGridView dataGridView;
     private System.Windows.Forms.TextBox columnsTextBox;
     private System.Windows.Forms.Label columnsLabel;