Changeset 9872

Timestamp:

08/09/13 16:32:42 (11 years ago)

Author:

gkronber

Message:

#2026 removed unused files

Location:

branches/HeuristicLab.Problems.GPDL

Files:

• HeuristicLab.Problems.GPDL.Views/3.4/Resources/LawnMower.txt (modified) (1 diff)
• HeuristicLab.Problems.GPDL/3.4/GPDef.atg (modified) (1 diff)
• HeuristicLab.Problems.GPDL/3.4/HeuristicLab.Problems.GPDL-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.GPDL/3.4/InterpreterBuilder.cs (deleted)
• HeuristicLab.Problems.GPDL/3.4/MethodBuilder.cs (deleted)
• HeuristicLab.Problems.GPDL/3.4/Parser.cs (modified) (1 diff)
• HeuristicLab.Problems.GPDL/3.4/ProblemGenerator.cs (modified) (7 diffs)
• HeuristicLab.Problems.GPDL/3.4/SymbolBuilder.cs (deleted)
• HeuristicLab.Problems.GPDL/3.4/Util.cs (moved) (moved from branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/SourceReader.cs) (1 diff)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/Resources/LawnMower.txt

@@ -102 +102 @@
 int[] ints = Enumerable.Range(-100, 201).ToArray();
 >>
-INIT <<
->>
 
 NONTERMINALS

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/GPDef.atg

@@ -150 +150 @@
                                                                                          myTNode.Ident = identStr;
                                                                                          myTNode.FormalParameters = src;
-                                                                                         myTNode.FieldDefinitions = SourceReader.ExtractFormalParameters(src);
+                                                                                         myTNode.FieldDefinitions = Util.ExtractFormalParameters(src);
                                                                                   .)
   [ "CONSTRAINTS" ConstraintDef<out constraints>

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/HeuristicLab.Problems.GPDL-3.4.csproj

@@ -192 +192 @@
     <Compile Include="AST.cs" />
     <Compile Include="Grammar.cs" />
-    <Compile Include="InterpreterBuilder.cs" />
-    <Compile Include="MethodBuilder.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="ProblemGenerator.cs" />
     <Compile Include="Scanner.cs" />
-    <Compile Include="SourceReader.cs" />
-    <Compile Include="SymbolBuilder.cs" />
+    <Compile Include="Util.cs" />
     <None Include="GPDef.atg" />
     <None Include="HeuristicLab.snk" />

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Parser.cs

@@ -218 +218 @@
     myTNode.Ident = identStr;
     myTNode.FormalParameters = src;
-    myTNode.FieldDefinitions = SourceReader.ExtractFormalParameters(src);
+    myTNode.FieldDefinitions = Util.ExtractFormalParameters(src);
     
     if (la.kind == 15) {

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/ProblemGenerator.cs

@@ -53 +53 @@
 ";
 
-  private string mainClassTemplate = @"
-namespace ?PROBLEMNAME? {
-  public sealed class ?IDENT?Main {
-    public ?IDENT?Main() { 
-      Initialize();
-    }    
-    public void Initialize() {
-      var problem = new ?IDENT?Problem();
-      var wh = new AutoResetEvent(false);
-      var ga = new OffspringSelectionGeneticAlgorithm();
-      ga.Engine = new SequentialEngine();
-      ga.Problem = problem;
-      ga.PopulationSize.Value = 1000;
-      ga.MaximumGenerations.Value = 100;
-      ga.ComparisonFactorLowerBound.Value = 0;
-      ga.ComparisonFactorUpperBound.Value = 0;
-      ga.MutationProbability.Value = 0.15;
-      ga.Mutator = ga.MutatorParameter.ValidValues.OfType<MultiSymbolicExpressionTreeManipulator>().First();
-      var ts = ga.SelectorParameter.ValidValues.OfType<GenderSpecificSelector>().First();
-      ga.Selector = ts;
-      ga.Prepare();
-      ga.ExceptionOccurred += (sender, args) => {
-        Console.WriteLine(args.Value);
-        wh.Set();
-      };
-      ga.Stopped += (sender, args) => {
-         Console.WriteLine(""Finished"");
-         Console.WriteLine(""Evaluated solutions: "" + ((IntValue)(ga.Results[""EvaluatedSolutions""]).Value).Value);
-         Console.WriteLine(""Best quality: "" + ((DoubleValue)(ga.Results[""BestQuality""]).Value).Value);
-         wh.Set();
-      };
-      ga.Crossover = ga.CrossoverParameter.ValidValues.First();
-      ga.Start();    
-      while(!wh.WaitOne(500)) {
-         if(ga.Results.ContainsKey(""BestQuality"")) {
-           int evalSolutions = ((IntValue)(ga.Results[""EvaluatedSolutions""]).Value).Value;
-           double quality = ((DoubleValue)(ga.Results[""BestQuality""]).Value).Value;
-           Console.WriteLine(""{0}\t{1} "", evalSolutions, quality);
-         }
-      };
-    }
-  }
-}";
-
   private string problemClassTemplate = @"
 namespace ?PROBLEMNAME? {
@@ -207 +163 @@
 
     ?CONSTRAINTSSOURCE?
-
   }
 }";
@@ -408 +363 @@
     GenerateEvaluator(definition);
     GenerateProblem(definition);
-    GenerateMain(definition);
 
     problemSourceCode.Replace("?PROBLEMNAME?", definition.Name);
 
+    // write to a file for debugging
     using (var stream = new StreamWriter(definition.Name + ".cs")) {
       stream.WriteLine(problemSourceCode.ToString());
     }
 
+    // compile generated source
     using (var csc = new CSharpCodeProvider(new Dictionary<string, string>() { { "CompilerVersion", "v4.0" } })) {
       var parameters = new CompilerParameters(new[] { "mscorlib.dll", "System.Core.dll", "System.dll", "System.Drawing.dll" }, Path.ChangeExtension(Path.GetRandomFileName(), ".dll"), true);
@@ -442 +398 @@
 
       CompilerResults results = csc.CompileAssemblyFromSource(parameters, problemSourceCode.ToString());
-      results.Errors.Cast<CompilerError>().ToList().ForEach(error => Console.WriteLine(error.Line + " " + error.ErrorText));
-
+      results.Errors.Cast<CompilerError>()
+        .ToList()
+        .ForEach(error => Console.WriteLine(error.Line + " " + error.ErrorText));
+
+      // load the assembly, and create an instance from the generate problem class
       var asm = results.CompiledAssembly;
       AppDomain.CurrentDomain.Load(asm.GetName());
@@ -460 +419 @@
     problemSourceCode.AppendLine(evaluatorClassCode).AppendLine();
   }
-
-  private void GenerateMain(GPDefNode definition) {
-    var mainClassCode =
-      mainClassTemplate
-        .Replace("?IDENT?", definition.Name);
-
-    problemSourceCode.AppendLine(mainClassCode).AppendLine();
-  }
-
 
   private void GenerateProblem(GPDefNode definition) {
@@ -511 +461 @@
     string formalParameter = definition.NonTerminals.Single(nt => nt.Ident == g.RootSymbol).FormalParameters;
     var actualParameterEnumerable =
-      SourceReader.ExtractFormalParameters(formalParameter).Select(e => e.RefOrOut + " " + e.Identifier);
+      Util.ExtractFormalParameters(formalParameter).Select(e => e.RefOrOut + " " + e.Identifier);
     string actualParameter = string.Empty;
     if (actualParameterEnumerable.Any()) {
@@ -524 +474 @@
     }
     foreach (var s in definition.Terminals) {
-      sb.AppendLine(GenerateTerminalInterpreterMethod(g, (TerminalNode)s));
-    }
-    return sb.ToString();
-  }
-
-  private string GenerateTerminalInterpreterMethod(Grammar g, TerminalNode s) {
+      sb.AppendLine(GenerateTerminalInterpreterMethod((TerminalNode)s));
+    }
+    return sb.ToString();
+  }
+
+  private string GenerateTerminalInterpreterMethod(TerminalNode s) {
     var sb = new StringBuilder();
     if (!s.FormalParameters.Any())

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Util.cs

@@ -24 +24 @@
 using System.Text.RegularExpressions;
 
-public class SourceReader {
-
+public class Util {
   private static Regex formalParameterExpr = new Regex(@"\s*,?\s*((?<refOrOut>(out|ref))\s+)?(?<type>[_\w]*)\s+(?<id>[_\w]*)\s*");
   public static IEnumerable<TerminalNode.FieldDefinition> ExtractFormalParameters(string formalParameterSrc) {