Changeset 15189 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/BenchmarkSuiteDataDescriptor.cs

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/BenchmarkSuiteDataDescriptor.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/BenchmarkSuiteDataDescriptor.cs

@@ -30 +30 @@
     protected abstract Example ParseExample(string[] input, string[] output);
 
-    //private IEnumerable<Example> ParseData() {
-    //  using (var file = GetType().Assembly.GetManifestResourceStream(InstanceArchiveName))
-    //  using (var archive = new ZipArchive(file, ZipArchiveMode.Read)) {
-    //    var entry = archive.Entries.SingleOrDefault(x => x.Name == FileName);
-
-    //    using (var parser = new TextFieldParser(entry.Open())) {
-    //      parser.TextFieldType = FieldType.Delimited;
-    //      parser.SetDelimiters(ExampleFieldDelimiter);
-    //      parser.HasFieldsEnclosedInQuotes = true;
-    //      parser.TrimWhiteSpace = false;
-
-    //      //Processing rows
-    //      while (!parser.EndOfData) {
-    //        var fields = parser.ReadFields();
-
-    //        if (fields.Length != InputArgumentCount + OutputArgumentCount)
-    //          throw new InvalidDataException("Number of values do not fit");
-
-    //        var input = fields.Take(InputArgumentCount).ToArray();
-    //        var output = fields.Skip(InputArgumentCount).ToArray();
-
-    //        yield return ParseExample(input, output);
-    //      }
-    //    }
-    //  }
-    //}
-
     private IEnumerable<Example> ParseData() {
       using (var file = GetType().Assembly.GetManifestResourceStream(InstanceArchiveName))
@@ -69 +42 @@
             var output = line.Skip(InputArgumentCount).ToArray();
 
-            yield return ParseExample(input, output);
+            var example = ParseExample(input, output);
+
+            yield return example;
           }
         }