Changeset 345 for branches/3.0/sources

Timestamp:

06/26/08 15:30:16 (17 years ago)

Author:

gkronber

Message:

• merged r338 r341 and r343 from the ticket-specific trunk into the HL3.0 stable branch
• fixed serialization and display of floating point numbers in HL3.0 stable plugins HeuristicLab.Functions and HeuristicLab.DataAnalysis

(ticket #175)

Location:

branches/3.0/sources

Files:

• HeuristicLab.Constraints/DoubleBoundedConstraint.cs (modified) (2 diffs)
• HeuristicLab.Constraints/DoubleBoundedConstraintView.cs (modified) (2 diffs)
• HeuristicLab.Data/ArrayDataBaseView.Designer.cs (modified) (1 diff)
• HeuristicLab.Data/ArrayDataBaseView.cs (modified) (1 diff)
• HeuristicLab.Data/ConstrainedDoubleDataView.cs (modified) (1 diff)
• HeuristicLab.Data/DoubleArrayData.cs (modified) (1 diff)
• HeuristicLab.Data/DoubleArrayDataView.cs (modified) (1 diff)
• HeuristicLab.Data/DoubleData.cs (modified) (1 diff)
• HeuristicLab.Data/DoubleDataView.cs (modified) (1 diff)
• HeuristicLab.Data/DoubleMatrixData.cs (modified) (1 diff)
• HeuristicLab.Data/DoubleMatrixDataView.cs (modified) (1 diff)
• HeuristicLab.Data/MatrixDataBaseView.Designer.cs (modified) (1 diff)
• HeuristicLab.DataAnalysis/Dataset.cs (modified) (8 diffs)
• HeuristicLab.DataAnalysis/DatasetView.cs (modified) (1 diff)
• HeuristicLab.Functions/FunctionView.cs (modified) (2 diffs)
• HeuristicLab.Random/NormalDistributedRandom.cs (modified) (1 diff)

branches/3.0/sources/HeuristicLab.Constraints/DoubleBoundedConstraint.cs

@@ -136 +136 @@
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
       XmlAttribute lb = document.CreateAttribute("LowerBound");
-      lb.Value = LowerBound.ToString(CultureInfo.InvariantCulture);
+      lb.Value = LowerBound.ToString("r", CultureInfo.InvariantCulture);
       XmlAttribute lbi = document.CreateAttribute("LowerBoundIncluded");
       lbi.Value = lowerBoundIncluded.ToString();
@@ -142 +142 @@
       lbe.Value = lowerBoundEnabled.ToString();
       XmlAttribute ub = document.CreateAttribute("UpperBound");
-      ub.Value = upperBound.ToString(CultureInfo.InvariantCulture);
+      ub.Value = upperBound.ToString("r", CultureInfo.InvariantCulture);
       XmlAttribute ubi = document.CreateAttribute("UpperBoundIncluded");
       ubi.Value = upperBoundIncluded.ToString();

branches/3.0/sources/HeuristicLab.Constraints/DoubleBoundedConstraintView.cs

@@ -69 +69 @@
         ubEnabledCheckBox.Enabled = false;
       } else {
-        lbTextBox.Text = DoubleBoundedConstraint.LowerBound + "";
+        lbTextBox.Text = DoubleBoundedConstraint.LowerBound.ToString("r");
         lbTextBox.Enabled = DoubleBoundedConstraint.LowerBoundEnabled;
         lbIncludedCheckBox.Checked = DoubleBoundedConstraint.LowerBoundIncluded;
@@ -76 +76 @@
         lbEnabledCheckBox.Enabled = true;
 
-        ubTextBox.Text = DoubleBoundedConstraint.UpperBound + "";
+        ubTextBox.Text = DoubleBoundedConstraint.UpperBound.ToString("r");
         ubTextBox.Enabled = DoubleBoundedConstraint.UpperBoundEnabled;
         ubIncludedCheckBox.Checked = DoubleBoundedConstraint.UpperBoundIncluded;

branches/3.0/sources/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/3.0/sources/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/3.0/sources/HeuristicLab.Data/ConstrainedDoubleDataView.cs

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

branches/3.0/sources/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/3.0/sources/HeuristicLab.Data/DoubleArrayDataView.cs

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

branches/3.0/sources/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/3.0/sources/HeuristicLab.Data/DoubleDataView.cs

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

branches/3.0/sources/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/3.0/sources/HeuristicLab.Data/DoubleMatrixDataView.cs

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

branches/3.0/sources/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;

branches/3.0/sources/HeuristicLab.DataAnalysis/Dataset.cs

@@ -66 +66 @@
     public double[] Samples {
       get { return samples; }
-      set { 
+      set {
         samples = value;
         CreateDictionaries();
@@ -81 +81 @@
     public Dataset() {
       Name = "-";
-      VariableNames = new string[] {"Var0"};
+      VariableNames = new string[] { "Var0" };
       Columns = 1;
       Rows = 1;
@@ -146 +146 @@
       rows = int.Parse(node.Attributes["Dimension1"].Value, CultureInfo.InvariantCulture.NumberFormat);
       columns = int.Parse(node.Attributes["Dimension2"].Value, CultureInfo.InvariantCulture.NumberFormat);
-      
+
       VariableNames = ParseVariableNamesString(node.Attributes["VariableNames"].Value);
 
@@ -154 +154 @@
       for(int row = 0; row < rows; row++) {
         for(int column = 0; column < columns; column++) {
-          if(double.TryParse(tokens[row * columns + column], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out samples[row*columns + column]) == false) {
+          if(double.TryParse(tokens[row * columns + column], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out samples[row * columns + column]) == false) {
             throw new FormatException("Can't parse " + tokens[row * columns + column] + " as double value.");
           }
@@ -171 +171 @@
         for(int column = 0; column < columns; column++) {
           builder.Append(";");
-          builder.Append(samples[row*columns+column].ToString(format));
+          builder.Append(samples[row * columns + column].ToString("r",format));
         }
       }
@@ -180 +180 @@
     private string GetVariableNamesString() {
       string s = "";
-      for (int i = 0; i < variableNames.Length; i++) {
+      for(int i = 0; i < variableNames.Length; i++) {
         s += variableNames[i] + "; ";
       }
 
-      if (variableNames.Length > 0) {
+      if(variableNames.Length > 0) {
         s = s.TrimEnd(';', ' ');
       }
@@ -192 +192 @@
     private string[] ParseVariableNamesString(string p) {
       p = p.Trim();
-      string[] tokens = p.Split(new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+      string[] tokens = p.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
       return tokens;
     }
 
     public double GetMean(int column) {
-      return GetMean(column, 0, Rows-1);
+      return GetMean(column, 0, Rows - 1);
     }
 
@@ -216 +216 @@
 
     public double GetRange(int column) {
-      return GetRange(column, 0, Rows-1);
+      return GetRange(column, 0, Rows - 1);
     }
 

branches/3.0/sources/HeuristicLab.DataAnalysis/DatasetView.cs

@@ -41 +41 @@
       InitializeComponent();
       openFileDialog = new OpenFileDialog();
+
+      dataGridView.DefaultCellStyle.Format = "r";
     }
 

branches/3.0/sources/HeuristicLab.Functions/FunctionView.cs

@@ -285 +285 @@
 
       public void Visit(Constant constant) {
-        prefix += currentIndend + "[T]Constant(" + constant.Value.Data.ToString() + ";0;0)";
+        prefix += currentIndend + "[T]Constant(" + constant.Value.Data.ToString("r") + ";0;0)";
       }
 
@@ -333 +333 @@
 
       public void Visit(HeuristicLab.Functions.Variable variable) {
-        prefix += currentIndend + "[T]Variable(" + variable.Weight + ";" + variable.VariableIndex + ";" + -variable.SampleOffset + ")";
+        prefix += currentIndend + "[T]Variable(" + variable.Weight.ToString("r") + ";" + variable.VariableIndex.ToString("r") + ";" + (-variable.SampleOffset).ToString("r") + ")";
       }
 

branches/3.0/sources/HeuristicLab.Random/NormalDistributedRandom.cs

@@ -516 +516 @@
 
       XmlNode muNode = document.CreateNode(XmlNodeType.Element, "Mu", null);
-      muNode.InnerText = mu.ToString(CultureInfo.InvariantCulture);
+      muNode.InnerText = mu.ToString("r", CultureInfo.InvariantCulture);
       node.AppendChild(muNode);
 
       XmlNode sigmaNode = document.CreateNode(XmlNodeType.Element, "Sigma", null);
-      sigmaNode.InnerText = sigma.ToString(CultureInfo.InvariantCulture);
+      sigmaNode.InnerText = sigma.ToString("r", CultureInfo.InvariantCulture);
       node.AppendChild(sigmaNode);