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

Timestamp:

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

Author:

pkimmesw

Message:

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

Location:

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

Files:

• BenchmarkSuiteDataDescriptor.cs (modified) (2 diffs)
• ProblemData.cs (modified) (2 diffs)
• Problems/Checksum.cs (modified) (2 diffs)
• Problems/NumberIo.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;
           }
         }

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

@@ -34 +34 @@
       ErcOptions = cloner.Clone(origin.ErcOptions);
       FloatStringFormat = origin.FloatStringFormat;
+      ProblemType = origin.ProblemType;
     }
 
@@ -51 +52 @@
     [Storable]
     public ExampleArgumentType[] OutputArgumentTypes { get; set; }
+
+    public int TotalIntputArgumentCount { get { return InputArgumentTypes.Length; } }
+    public int TotalOutputArgumentCount { get { return OutputArgumentTypes.Length; } }
     public int TotalArgumentCount { get { return InputArgumentTypes.Length + OutputArgumentTypes.Length; } }
+
     [Storable]
     public Example[] Examples { get; set; }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/Checksum.cs

@@ -2 +2 @@
   using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Char;
   using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Integer;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.String;
 
   public class Checksum : BenchmarkSuiteDataDescriptor {
@@ -35 +36 @@
           CharErcOptions = new CharErcOptions(
             new IntegerConstantErc(' '),
-            new IntegerRangeErc(0x20, 0x7e))
+            new IntegerRangeErc(0x20, 0x7e)),
+          StringErcOptions = new StringErcOptions(
+            new StringConstantErc("Check sum is "))
         }
       };

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/NumberIo.cs

@@ -24 +24 @@
         WorstResult = 400,
         InputArgumentTypes = new[] { ExampleArgumentType.Float, ExampleArgumentType.Integer },
-        OutputArgumentTypes = new[] { ExampleArgumentType.Float },
+        OutputArgumentTypes = new[] { ExampleArgumentType.Print },
         TrainingCount = 25,
         TestCount = 1000,
-        EnabledDataTypes = DataTypes.Integer | DataTypes.Float, // | DataTypes.Print,
+        EnabledDataTypes = DataTypes.Integer | DataTypes.Float | DataTypes.Print,
         EvalLimit = 200,
         MaxSize = 200,
@@ -48 +48 @@
         InputInteger = ExampleArgumentConverter.ConvertIntegers(input[1]),
         OutputFloat = ExampleArgumentConverter.ConvertDoubles(output),
-        //OutputPrint = estimedFloatValue.ToString("R", CultureInfo.InvariantCulture),
+        OutputPrint = estimedFloatValue.ToString("R", CultureInfo.InvariantCulture),
       };
     }