Changeset 17418 for branches/3040_VectorBasedGP/HeuristicLab.DataPreprocessing/3.4/Data

Timestamp:

02/03/20 17:25:38 (5 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)

File:

• branches/3040_VectorBasedGP/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs (modified) (3 diffs)

branches/3040_VectorBasedGP/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs

@@ -407 +407 @@
         } else if (dataset.VariableHasType<DateTime>(variableName)) {
           variableValues.Insert(columnIndex, dataset.GetDateTimeValues(variableName).ToList());
+        } else if (dataset.VariableHasType<DoubleVector>(variableName)) {
+          variableValues.Insert(columnIndex, dataset.GetDoubleVectorValues(variableName).ToList());
         } else {
           throw new ArgumentException("The datatype of column " + variableName + " must be of type double, string or DateTime");
@@ -681 +683 @@
       l = 0;
       ir = n - 1;
-      for (;;) {
+      for (; ; ) {
         if (ir <= l + 1) {
           // Active partition contains 1 or 2 elements.
@@ -706 +708 @@
           j = ir;
           a = arr[l + 1]; // Partitioning element.
-          for (;;) { // Beginning of innermost loop.
+          for (; ; ) { // Beginning of innermost loop.
             do i++; while (arr[i].CompareTo(a) < 0); // Scan up to find element > a.
             do j--; while (arr[j].CompareTo(a) > 0); // Scan down to find element < a.