Changeset 17418 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis

Timestamp:

02/03/20 17:25:38 (4 years ago)

Author:

pfleck

Message:

#3040

• (partially) enabled data preprocessing for vectorial data
• use flat zip-files for large benchmarks instead of embedded resources (faster build times)
• added multiple variants of vector benchmark I (vector lengh constraints)

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Vectors

Files:

• DoubleVector.cs (modified) (1 diff)
• Vector.cs (modified) (3 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Vectors/DoubleVector.cs

@@ -85 +85 @@
 
     public double Sum() {
-      return values.Sum();
+      return Values.Sum();
     }
 
     public double Mean() {
-      return values.Average();
+      return Values.Average();
     }
 
     public DoubleVector CumulativeMean() {
+      // todo: zero range average throws exception
       return new DoubleVector(
         Enumerable.Range(0, this.Count)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Vectors/Vector.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -29 +30 @@
   public abstract class Vector<T> : IVector<T> {
     [Storable]
-    protected readonly List<T> values;
+    protected readonly List<T> Values;
 
     protected Vector(IEnumerable<T> values) {
-      this.values = values.ToList();
+      this.Values = values.ToList();
     }
 
@@ -38 +39 @@
     protected Vector(StorableConstructorFlag _) { }
 
+    public override string ToString() {
+      const int maxCount = 10;
+      string extension = Values.Count > maxCount ? ", ..." : "";
+      return $"[{string.Join(", ", Values.Cast<object>().Take(Math.Min(Values.Count, maxCount)))}{extension}]";
+    }
 
     #region Interface members
 
     public int Count {
-      get { return values.Count; }
+      get { return Values.Count; }
     }
 
     public T this[int index] {
-      get { return values[index]; }
+      get { return Values[index]; }
     }
 
     public IEnumerator<T> GetEnumerator() {
-      return values.GetEnumerator();
+      return Values.GetEnumerator();
     }