Changeset 15973 for branches/2522_RefactorPluginInfrastructure/HeuristicLab.Data/3.3/DoubleArray.cs

Timestamp:

06/28/18 11:13:37 (6 years ago)

Author:

gkronber

Message:

#2522: merged trunk changes from r13402:15972 to branch resolving conflicts where necessary

Location:

branches/2522_RefactorPluginInfrastructure

Files:

• . (modified) (2 props)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/DoubleArray.cs (modified) (5 diffs)

branches/2522_RefactorPluginInfrastructure

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/2522_RefactorPluginInfrastructure/HeuristicLab.Data/3.3/DoubleArray.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
   [Item("DoubleArray", "Represents an array of double values.")]
   [StorableClass]
-  public class DoubleArray : ValueTypeArray<double>, IStringConvertibleArray {
+  public class DoubleArray : StringConvertibleArray<double> {
     [StorableConstructor]
     protected DoubleArray(bool deserializing) : base(deserializing) { }
@@ -42 +42 @@
     }
 
-    protected virtual bool Validate(string value, out string errorMessage) {
+    protected override bool Validate(string value, out string errorMessage) {
       double val;
       bool valid = double.TryParse(value, out val);
@@ -55 +55 @@
       return valid;
     }
-    protected virtual string GetValue(int index) {
+    protected override string GetValue(int index) {
       return this[index].ToString("r");
     }
-    protected virtual bool SetValue(string value, int index) {
+    protected override bool SetValue(string value, int index) {
       double val;
       if (double.TryParse(value, out val)) {
@@ -67 +67 @@
       }
     }
-
-    #region IStringConvertibleArray Members
-    int IStringConvertibleArray.Length {
-      get { return Length; }
-      set { Length = value; }
-    }
-    bool IStringConvertibleArray.Validate(string value, out string errorMessage) {
-      return Validate(value, out errorMessage);
-    }
-    string IStringConvertibleArray.GetValue(int index) {
-      return GetValue(index);
-    }
-    bool IStringConvertibleArray.SetValue(string value, int index) {
-      return SetValue(value, index);
-    }
-    #endregion
   }
 }

@@ -24 +24 @@
 protoc.exe
 obj
+.vs