Changeset 2665 for trunk/sources/HeuristicLab.Data/3.3

Timestamp:

01/21/10 05:10:12 (15 years ago)

Author:

swagner

Message:

Continued work on adapting and refactoring HeuristicLab.Data according to the changes in HeuristicLab.Core (#95)

Location:

trunk/sources/HeuristicLab.Data/3.3

Files:

• BoolData.cs (modified) (1 diff)
• BoolDataView.Designer.cs (deleted)
• BoolDataView.cs (deleted)
• BoolDataView.resx (deleted)
• DateTimeData.cs (added)
• DoubleData.cs (modified) (1 diff)
• DoubleDataView.Designer.cs (deleted)
• DoubleDataView.cs (deleted)
• DoubleDataView.resx (deleted)
• HeuristicLab.Data-3.3.csproj (modified) (1 diff)
• IStringConvertibleData.cs (added)
• IntData.cs (modified) (2 diffs)
• IntDataView.Designer.cs (deleted)
• IntDataView.cs (deleted)
• IntDataView.resx (deleted)
• ReferenceTypeData.cs (added)
• StringData.cs (modified) (1 diff)
• StringDataView.Designer.cs (deleted)
• StringDataView.cs (deleted)
• StringDataView.resx (deleted)
• TimeSpanData.cs (added)

trunk/sources/HeuristicLab.Data/3.3/BoolData.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Data {
-  /// <summary>
-  /// Class to represent boolean values.
-  /// </summary>
   [EmptyStorableClass]
-  public class BoolData : ObjectData {
-    /// <summary>
-    /// Gets or sets the boolean value.
-    /// </summary>
-    /// <remarks>Uses property <see cref="ObjectData.Data"/>
-    /// of base class <see cref="ObjectData"/>. No own data storage present.</remarks>
-    public new bool Data {
-      get { return (bool)base.Data; }
-      set { base.Data = value; }
+  [Item("Boolean", "Represents a boolean value.")]
+  [Creatable("Test")]
+  public sealed class BoolData : ValueTypeData<bool>, IStringConvertibleData {
+    public BoolData() : base() { }
+    public BoolData(bool value)
+      : base() {
+      Value = value;
     }
 
-    /// <summary>
-    /// Initializes a new instance of <see cref="BoolData"/> with default value <c>false</c>.
-    /// </summary>
-    public BoolData() {
-      Data = false;
-    }
-    /// <summary>
-    /// Initializes a new instance of <see cref="BoolData"/> with the boolean value <paramref name="data"/>.
-    /// </summary>
-    /// <param name="data">The boolean value to assign.</param>
-    public BoolData(bool data) {
-      Data = data;
+    public override IDeepCloneable Clone(Cloner cloner) {
+      BoolData clone = new BoolData(Value);
+      cloner.RegisterClonedObject(this, clone);
+      return clone;
     }
 
-    /// <summary>
-    /// Clones the current instance.
-    /// </summary>
-    /// <remarks>The cloned instance is added to the <paramref name="dictionary"/>.</remarks>
-    /// <param name="clonedObjects">Dictionary of all already cloned objects.</param>
-    /// <returns>The cloned instance as <see cref="BoolData"/>.</returns>
-    public override IItem Clone(ICloner cloner) {
-      BoolData clone = new BoolData();
-      cloner.RegisterClonedObject(this, clone);
-      clone.Data = Data;
-      return clone;
+    string IStringConvertibleData.GetValue() {
+      return Value.ToString();
+    }
+    bool IStringConvertibleData.SetValue(string value) {
+      bool b;
+      if (bool.TryParse(value, out b)) {
+        Value = b;
+        return true;
+      } else {
+        return false;
+      }
     }
   }

trunk/sources/HeuristicLab.Data/3.3/DoubleData.cs

@@ -25 +25 @@
 using System.Xml;
 using HeuristicLab.Core;
-using System.Globalization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Data {
-  /// <summary>
-  /// Class to represent double values.
-  /// </summary>
   [EmptyStorableClass]
-  public class DoubleData : ObjectData {
-    /// <summary>
-    /// Gets or sets the double value.
-    /// </summary>
-    /// <remarks>Uses property <see cref="ObjectData.Data"/> of base class <see cref="ObjectData"></see>. 
-    /// No own data storage present.</remarks>
-    public new double Data {
-      get { return (double)base.Data; }
-      set { base.Data = value; }
+  [Item("Double", "Represents a double value.")]
+  [Creatable("Test")]
+  public sealed class DoubleData : ValueTypeData<double>, IStringConvertibleData {
+    public DoubleData() : base() { }
+    public DoubleData(double value)
+      : base() {
+      Value = value;
     }
 
-    /// <summary>
-    /// Initializes a new instance of <see cref="DoubleData"/> with default value <c>0.0</c>.
-    /// </summary>
-    public DoubleData() {
-      Data = 0.0;
-    }
-    /// <summary>
-    /// Initializes a new instance of <see cref="DoubleData"/>.
-    /// <note type="caution"> No CopyConstructor! <paramref name="data"/> is not copied!</note>
-    /// </summary>
-    /// <param name="data">The double value the instance should represent.</param>
-    public DoubleData(double data) {
-      Data = data;
+    public override IDeepCloneable Clone(Cloner cloner) {
+      DoubleData clone = new DoubleData(Value);
+      cloner.RegisterClonedObject(this, clone);
+      return clone;
     }
 
-    /// <summary>
-    /// Clones the current instance and adds it to the dictionary <paramref name="clonedObjects"/>.
-    /// </summary>
-    /// <param name="clonedObjects">Dictionary of all already cloned objects.</param>
-    /// <returns>The cloned instance as <see cref="DoubleData"/>.</returns>
-    public override IItem Clone(ICloner cloner) {
-      DoubleData clone = new DoubleData();
-      cloner.RegisterClonedObject(this, clone);
-      clone.Data = Data;
-      return clone;
+    string IStringConvertibleData.GetValue() {
+      return Value.ToString();
+    }
+    bool IStringConvertibleData.SetValue(string value) {
+      double d;
+      if (double.TryParse(value, out d)) {
+        Value = d;
+        return true;
+      } else {
+        return false;
+      }
     }
   }

trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

@@ -100 +100 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BoolData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ReferenceTypeData.cs" />
+    <Compile Include="StringData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TimeSpanData.cs" />
+    <Compile Include="DateTimeData.cs" />
+    <Compile Include="DoubleData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IStringConvertibleData.cs" />
     <Compile Include="ValueTypeData.cs">
       <SubType>Code</SubType>

trunk/sources/HeuristicLab.Data/3.3/IntData.cs

@@ -29 +29 @@
 namespace HeuristicLab.Data {
   [EmptyStorableClass]
-  [Item("Int Data", "Represents an integer value.")]
+  [Item("Integer", "Represents an integer value.")]
   [Creatable("Test")]
-  public sealed class IntData : ValueTypeData<int> {
+  public sealed class IntData : ValueTypeData<int>, IStringConvertibleData {
     public IntData() : base() { }
     public IntData(int value)
@@ -43 +43 @@
       return clone;
     }
+
+    string IStringConvertibleData.GetValue() {
+      return Value.ToString();
+    }
+    bool IStringConvertibleData.SetValue(string value) {
+      int i;
+      if (int.TryParse(value, out i)) {
+        Value = i;
+        return true;
+      } else {
+        return false;
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.Data/3.3/StringData.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Data {
-  /// <summary>
-  /// The representation of a string.
-  /// </summary>
   [EmptyStorableClass]
-  public class StringData : ObjectData {
-    /// <summary>
-    /// Gets or sets the string value.
-    /// </summary>
-    /// <remarks>Uses property <see cref="ObjectData.Data"/> of base class <see cref="ObjectData"/>. 
-    /// No own data storage present.</remarks>
-    public new string Data {
-      get { return (string)base.Data; }
-      set { base.Data = value; }
+  [Item("String", "Represents a string.")]
+  [Creatable("Test")]
+  public sealed class StringData : ReferenceTypeData<string>, IStringConvertibleData {
+    public StringData() : base() {
+      Value = string.Empty;
+    }
+    public StringData(string value)
+      : base() {
+      Value = value;
     }
 
-    /// <summary>
-    /// Initializes a new instance of <see cref="StringData"/> 
-    /// with the name of the type of the current instance as default value.
-    /// </summary>
-    public StringData() {
-      Data = this.GetType().Name;
-    }
-    /// <summary>
-    /// Initializes a new instance of <see cref="StringData"/> with the specified <paramref name="data"/>.
-    /// </summary>
-    /// <param name="data">The string value the current instance should represent.</param>
-    public StringData(string data) {
-      Data = data;
-    }
-
-    /// <summary>
-    /// Clones the current instance.
-    /// </summary>
-    /// <remarks>The current instance is added to the dictionary <paramref name="clonedObjects"/>.</remarks>
-    /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
-    /// <returns>The coned instance as <see cref="StringData"/>.</returns>
-    public override IItem Clone(ICloner cloner) {
-      StringData clone = new StringData();
+    public override IDeepCloneable Clone(Cloner cloner) {
+      StringData clone = new StringData(Value);
       cloner.RegisterClonedObject(this, clone);
-      clone.Data = Data;
       return clone;
     }
 
-    /// <summary>
-    /// The string representation of the current instance.
-    /// </summary>
-    /// <returns>The string value.</returns>
-    public override string ToString() {
-      return Data;
+    string IStringConvertibleData.GetValue() {
+      return Value;
+    }
+    bool IStringConvertibleData.SetValue(string value) {
+      Value = value != null ? value : string.Empty;
+      return true;
     }
   }